Merge branch 'upstream' into working
Use braces around if blocks

Adds { } around the single-line if blocks
Activate "curly" jshint

This should prevent any curly bracket issues in future
Merge pull request #134 from tpkelly/develop

Use braces around if blocks