merge and style update
Merge branch 'home_improvements' of https://github.com/crowdata/crowdata into home_improvements