Refactor commands to be a bit more self contained
Merge branch 'master' of https://github.com/jrkhan/raindance