Map edition

loads of stuff
uhoh
Merge branch 'master' of https://github.com/corpusc/Paramancer