Merge pull request #53 from groupon/doug/3

merged
Merge branch 'master' into doug/3
formatting