Merge pull request #272 from Aurorastation/development

Map Hotfix 24SEP2014
New icons for all. Yaaaaay...

Also, fugbixes including spooky ghost tampering + forgotten hair.
derp derp herp

Wrong bullet + duplicate name. Fixed.
Merge pull request #273 from SueTheCake/newicons

Fixes + Left out Stuff
Merge pull request #275 from Aurorastation/master

Updating Dumb