Master -> Dev post APC Sanity fix.

Map fixes post merge, removed the extra bit of the removed misc-science that somehow got left behind.

Fixed the disposals derp where an entire branch is disconnected, fixed APC names in new area on dev.

And yes, I indeed did use maptools, the disposals derp was just that derpy.