did a bunch of awesome stuff
Merge branch 'master' of https://github.com/zgrove/razzledazzle

did a bunch of awesome stuff