Add some guidelines on cartography, based on discussions at SotM13
Fix error in conversion to variables.
Merge remote-tracking branch 'official/master'