More stuff
Merge branch 'master' of https://github.com/quarian/spawncamping-bugfixes
Features, yo