map generation is now somewhat reasonable
Merge branch 'master' of git://github.com/jdoda/uncooperative