clearing project so that we can move to Rails
Merge branch 'master' of https://github.com/GorgeouslyHumble/kerfluffle