final most things & style cleanups
Braces everywhere

Let's not goto fail.

Inline with the Google Java Style,
https://google-styleguide.googlecode.com/svn/trunk/javaguide.html
Merge pull request #79 from airbnb/pierre/style_cleanup_20140512

Style cleanup