Misc changes
Merge branch 'master' of github.com:zdb3/flasktestagain