Fixed something I left in by accident
Merge branch 'develop'
Merge branch 'master' of https://github.com/andrewclegg/snake-charmer