Merge pull request #154 from bgrayless/consistent_styles

Consistent styles
Merge branch 'master' into fix_sprite_cropping
Merge pull request #155 from bgrayless/fix_sprite_cropping

Fix sprite cropping
Merge branch 'master' into tweak_approval_state