Revert "Take off the including of contacts in aspectscontroller.  Cross your fingers for a performance boost."

This reverts commit 7baeaebe.

Take off the including of contacts in aspectscontroller.  Cross your fingers for a performance boost.

This reverts commit 696779d5.

the connection adapter messes with single process mode...
This reverts commit dd752d7d.

thing. use built in resque inline method for single process mode

Take some stuff out of the travis run, I think we need to use headless instead of an explicit xvfb.  Turning off travis for now.

Don't need edit button on public profiles

Some more translation stuff.  @MrZYX the content thing in the Diaspora ID explanation is messed up, what's the best way to get bold text into the translation string?

add contact images to aspect index, removed comment background color, add vertical rule to people pages

Issue #1050: Changed cancel-link of a new message to back

correct reference to ./config/app.yml

The page that is initially shown after starting diaspora for the first
time tells the administrator to customize ./config/app.yml.example,
which doesn't exist. The file is actually called
./config/application.yml.example.