made shooter a little nicer
fixed obscene ('whack') compile errors
Merge branch 'master' of git://github.com/swarage/612-2013 into swaraj

Conflicts:
	shooter.cpp
Compile fixes