Merge pull request #12 from ZomgPonies/master

Update
Map Bugfixes, some past due Ninja changes
Merge pull request #197 from SamCroswell/master

Map bugfixes and a few changes to Ninja