BUGFIX: clicking on the Logo generates a javascript error
Merge pull request #1790 from Bahanix/master

Update french locales
fixed a couple typos in the French translations :fr:
BUGFIX: hide sensitive site settings
Make SMTP authentication mechanism configurable.
there is no need for that much $
Merge pull request #1791 from vikhyat/smtp-auth-option

Make SMTP authentication mechanism configurable.
Merge pull request #1457 from skisulli/keyboard-shortcuts

Global Gmail style keyboard shortcuts
fix jshint
FIX: Email preview with no date caused a server error
When signing up with 3rd party verified email, don't allow changing email in the signup form. Add ability to cancel signup form, which clears its state.
FEATURE: add go to /top page keyboard shortcut
BUGFIX: pressing '?' will now always open the keyboard shortcut modal
Give a better error message from the server if you've been replying too much.
remove debugger
Category description placeholder text mentions that the category won't appear on categories page unless it has topics or the placeholder text is replaced with a real category description.
Remove database.yml from vagrant chef cookbook. Don't need to copy database.yml anymore.
fix typos in EN translations
Attempt to fix spec under vagrant
BUGFIX: Top page wasn't display any topics