Stashed
Merge branch 'master' of https://github.com/ajclarke/shafted
Push for Rich
Merge branch 'master' of https://github.com/ajclarke/shafted