More informative error on metadata parsing failure
Merge branch 'lessDiskSpace'
Merge branch 'master' of github.com:bmschmidt/Presidio