Some Rails4 updates
Link to edit "About Me" links directly to the field.
JSHint fix
Merge pull request #1226 from stephankaag/rails4_updates

Some Rails4 updates
staff can change trust levels
work around for http://meta.discourse.org/t/activerecord-statementinvalid-exception-raised-in-models-user-action-rb/7275/4
correct: http://meta.discourse.org/t/cant-save-adding-a-group-permission-to-a-category/8537

can not save category after adding a new custom group
Parameterize the PBKDF2 algorithm in application config

http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
Merge pull request #1241 from dougalcorn/config-pbkdf-algorithm

Parameterize the PBKDF2 algorithm in application config
tone down badges for the love of all that is good
remove dupes before correcting topic_ids in user action consistency check job
correct no highlighting categories when clicked
deleted class only for real deleted posts
correct bug where delete stub job would fail when attempting to delete stubs off deleted topics
skip deleting stubs if a post is actively flagged
ENOUGH WITH THE DAMN "GiB" ALREADY
add minor clarifications based on feedback
make redis update section match nginx update section
clarify what "private network" means, specifically
multisite desc should be simpler and less scary
Merge branch 'master' of https://github.com/discourse/discourse