Merge branch 'master' of http://github.com/keeler/quash
Merge branch 'master' of http://github.com/keeler/quash