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`.
Consistency in SQL style
Added code climate status image
Merge branch 'topic-reply-button-state' of https://github.com/tms/discourse
WIP, a very nice refactoring of TopicsController#show
Some mobile optimisations - mainly for the header./merged all mobile changes into mobile.css.scss
scaffolding for message bus diags
emoji should not be coupled into the core
avatars were being counted and should not have been for basic users
remove old buggy code see: http://meta.discourse.org/t/quoted-you-emails/2226/3
notify by display name is silly, display name is not unique in the system
Merge pull request #114 from edward/patch-1

Consistency in SQL style
set window height as maximum height of div_resizer

This fixes the issue where a user can resize the div so that grippie is
no longer visible and is not reize the div back.
Merge branch 'master' of github.com:discourse/discourse
Users with no email_tokens return true from email_confirmed
Use the new mothership change_nickname API
Introduction of Chef to Vagrant. Removed redis.yml and database.yml. Also updated
instructions a lot, and included setup instructions for provisioning your own VM.

Closes #28 and #61.
Adjust some regular expressions

* Match beginning of string instead of beginning of line.
* Escape literal periods.
Merge commit '3875806315ef1122edbaf619b72a74f2c89926b0'
Oops, database.yml and redis.yml were still included