new onebox style (similar to blockquotes), spacing for auto-close message, making link badge easier to read
quick fix
remove discourse dependency from message bus
Merge pull request #1651 from awesomerobot/master

New onebox styles, and a few small fixes
do not customize the admin section
FIX: Pagination while sorting on column headers
Support for tracking the count of unique participants in a topic
Enable column sorting main topic list
Load site settings from config/site_settings.yml
Add site setting category support
Filter on site settings across all categories
Move save and resetDefault actions to the adminSiteSettingsCategory controller
Move some site settings around
Style the site setting category links. Required and Basic Setup are bigger and all other links are to the right of them.
FIX: a js error when reloading /admin/site_settings/category/:id
Version bump to v0.9.7.4
Avoiding double manifest files

Capistrano chokes if there's two manifest files. 
http://meta.discourse.org/t/rails-4-non-digest-assets-and-capistrano/10948?u=scotterc
Merge pull request #1654 from ScotterC/patch-2

Avoiding double manifest files
unicorn out of band GC
Fixing a bug which allowed groups to be created having the same name as an automatic group, precipitating chaos, as well as neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in Guardian#can_create_topic?, causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein.