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.
Update DEVELOPMENT.md

Add missing `git clone` command.
Disable reply button on archived/closed topics
Consistency in SQL style
Added code climate status image
Fix 1px button cut off on topic progress up / down buttons.
Little things:

- Retries on deadlock when calculating average time
- Removes Warning: When specifying html format for errors
- Doesn't use manual SQL to update user's ip address
Merge pull request #128 from alxndr/master

Typo fix
Don't update the current ip to an empty string
Fixes: Bug concatenating string URL with integer id
Merge branch 'topic-reply-button-state' of https://github.com/tms/discourse
Merge pull request #109 from tms/topic-reply-button-state

Disable reply button on archived/closed topics
Merge pull request #102 from charlesroper/patch-1

Update DEVELOPMENT.md
Merge pull request #122 from cjbell88/fix_minor_button_cut_off

Fix 1px button cut off on topic progress up / down buttons.
Merge pull request #94 from danneu/plugin-registry-patch

Extracted default value initializers.
WIP, a very nice refactoring of TopicsController#show
Some mobile optimisations - mainly for the header./merged all mobile changes into mobile.css.scss