Add tox to test requires; Better handle mal-formed JSON errors;
Add tox to test requires;
Merge remote-tracking branch 'upstream/master'
Fixed mismatch between tenantsecret table's FKs and the ids of the models;
Adding err.log to git ignore list; Remove spurious log;
Merge pull request #88 from jfwood/master

Add tox to test requires; Better handle mal-formed JSON errors;