add .h5 and MapData to .gitignore
force folder names to be strings (not unicode)
improve map2hdf5 script
resolve version conflicts
Merge branch 'master' of https://github.com/newville/xrmcollect