Merge branch 'master' into style-changes
Mass style changes.

Move to 2-spaces for everything except jade templates for now.

Oh gosh `git blame` is going to hate me.
Mass jade style changes.

Now using 2x spacing for indentation.
Style change: Only use semicolons if necessary.
Applied semicolon style changes to client src js files.
Further minute style changes.

Spacing, var declarations, etc.
Merge branch 'style-changes'