Changed mangle.py to work with the combined file format
Merge branch 'master' of github.com:SkyTruth/pybossa_tools