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`.
Merge branch 'topic-reply-button-state' of https://github.com/tms/discourse
Merge branch 'master' of github.com:discourse/discourse
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.
Merge commit '3875806315ef1122edbaf619b72a74f2c89926b0'
Oops, database.yml and redis.yml were still included