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`.
a few minor copyedits, 1px adjust
Fixes some minor issues with users deleting their own posts.
Added travis-ci build status image

Now that discourse is using travis-ci, why not show the build status right in the README?

Note: not sure where to place it...

Documentation is over here: http://about.travis-ci.org/docs/user/status-images/
Merge pull request #65 from ZogStriP/patch-3

Added travis-ci build status image
I have no objection to the removing of haml, but breaking our templates ... bad
Merge branch 'master' of github.com:discourse/discourse
Run Jasmine specs in Travis CI
Updated to acts_as_paranoid. Fixes #5.
Merge pull request #67 from arikfr/master

Configured Travis CI to run Jasmine specs too
Always show username on hover, unless there's something else more interesting to say.
Mothership#current_discourse_version had an invalid path
Username validation in signup and username change forms
Button container should be no wider than suggested topics

The button container sticks out farther than necessary because of the
left margin, causing unnecessary horizontal scrolling at supported
resolutions
Restore NFS shares on darwin & 1024MB in Vagrant.
Added requirements on postgres and redis-server
Extracted default value initializers.
message bus fixes and diagnostics