#129, put things back how they were
Merge branch 'master' of https://github.com/ndmitchell/shake