Almost fixed ghost bunnies
Merge branch 'makr' of github.com:dcrosby42/aoldrts into makr
Merge branch 'makr' of github.com:dcrosby42/aoldrts into makr
Client-side message spying logging
Merge branch 'master' of github.com:dcrosby42/aoldrts
Merge branch 'makr' of github.com:dcrosby42/aoldrts into makr
Fix missing bunny
Merge branch 'makr'

Conflicts:
	public/js/app.js
	src/rts_world.coffee
merged with makr
Merge branch 'master' of https://github.com/dcrosby42/aoldrts into map_tiles
changed where MapTiles was registered in order to cause a bug to happen earlier
merged