Merge branch 'master' into vagrant-chef
Merge branch 'master' into vagrant-chef
Use chef-solo to install phantomjs into Vagrant VM.

This introduces two configuration management runs into the
Vagrant provisioning phase. The first chef-solo run ensures that
a current version of chef is installed using the omnibus updater.
The second chef-solo run installs vim and phantomjs.

Much more is possible, this is a proof of concept.
Cookbooks are stored in the chef directory, and managed by
librarian-chef, which is like a bundler for cookbooks.

Chef is run when VM is first downloaded and booted, but not on
subsequent halt/up cycles. To force chef to run again, use
`vagrant provision`.
Extracted default value initializers.
Merge branch 'master' of git://github.com/gammons/discourse
Merge branch 'clean_up_gemfile' of git://github.com/johnmcdowall/discourse
Correcting link to Mailcatcher
Instruct developers to prepare the test DB before launching guard
add local greyscale dev logos
Merge pull request #97 from jaimeiniesta/documentation

Instruct developers to prepare the test DB before launching guard
Merge pull request #95 from tjstein/tjstein-02092013

Correcting link to Mailcatcher
update /faq more after sleeping on it
copyedit on PM invite button
Use define_method instead of eval-ing a string

It avoids the need for escaping the interpolations.
Prevent Firefox from using a more-specific text color definition in place of the placeholder color
Swap name / title in activity stream, link post number
Merge pull request #99 from tms/firefox-placeholders

Prevent Firefox from using the wrong placeholder colour
Show "You" to same-user on activity stream items
Allow forcing username as image title when generating avatar
Merge pull request #101 from tms/profile-stream-cleanup

Tweaked profile stream activity entries