push from master branch
better handling of loading of models from disk
allow specifying of mapping file when doing a resync
test for returning of same mapping
revert travis changes
remove debug print (thanks @froztbyte)
Merge branch 'feature/issue-35-allow-setting-of-mappings' into develop