trying to get map working again2

trying to get map working again2
please don't break
Merge branch 'master' of https://github.com/vmathur/mhacks3
Merging Map back in with Noorain's working stuff