Updated map.csv and some minor fixes

Cvaughn took a lot of time creating a map.csv for better mapping of old objects in 0.5.1.1 to 0.6, so this should greatly increase the number of maps that properly convert.