Merge pull request #1 from ZomgPonies/master

Update
Ninja objects minor edit
Minor map tweaks
Merge pull request #309 from SamCroswell/master

Minor map tweaks