PHPCS fixes
BRACE ALL THE THINGS

See http://make.wordpress.org/core/2013/11/13/proposed-coding-standards-change-always-require-braces/
Merge pull request #15 from x-team/phpcs-fixes

PHPCS fixes