Merge pull request #46 from jamiedigweed/master

Map fixes, merge tool fucked :/ And added nuke verb!