vcloud extension, fixed error message syntax
import in ui - fixed an issue where 'conflict' flag was ignored when using json format
API - import_backup now accepts the on_conflict option
API - export_task now supports JSON format backups
Closes #330 - parameters are now json when json format is specified for export/import
Merge branch 'master' of github.com:cloudsidekick/cato
Merge branch 'master' of https://github.com/cloudsidekick/cato
updated pytds version number requirement
Merge branch 'master' of github.com:cloudsidekick/cato
made the "feature" toggles in catoconfig.py an optional setting
Merge branch 'master' of https://github.com/cloudsidekick/cato
bumped version
Merge branch 'master' of github.com:cloudsidekick/cato