Fix spelling of noscript in the settings page.
fix mentions in code blocks
No more reboot on first try

Not sure if removing omnibus is a good idea though.
Remove redundant 'are'.
Merge pull request #1272 from ugisozols/remove_redundant_are

Remove redundant 'are'.
Merge pull request #1266 from bolandrm/fix_at_sign

fix mentions in code blocks
Merge branch 'fix_spelling_on_settings' of git://github.com/makeheadspace/discourse into makeheadspace-fix_spelling_on_settings
Merge branch 'makeheadspace-fix_spelling_on_settings'

Conflicts:
	config/locales/server.en.yml
oops background-color not color
minor activation copy improvement
Front-end Optimizations
FIX: Back button broke when clicking @mentions
Add rake task multisite:rollback
Add indexes to help IncomingLinksReport, but not much. Refactor to limit result set size, but it doesn't help perf much either. SELECT COUNT(DISTINCT ...) is still slow.
Use allow_uncategorized_topics site setting in categoryChoose
update fog gem to latest
removed old rake task until it's updated
enable thumbnailing on S3

- added url to optimized image model
- refactored s3_store & local_store
Update INSTALL-ubuntu.md

The removed paragraph was useful for a previous version of the "Updating Discourse" code above it. It seems useless now, as precise instructions are already in the code comments. In fact, it became incoherent, as we explicitily have "bluepill quit" in the code now.
odd formatting