Misc cleanup and tweaks
Merge branch 'master' of https://github.com/bewoodall/banjo-game