Merge pull request #154 from bgrayless/consistent_styles

Consistent styles
Merge branch 'master' into fix_sprite_cropping