Map changes, new ninja masks, more commits possibly to come

These are all the map changes I should need to make for the moment. More PRs may come soon, but this will be the only one that changes the map at all.