Another round of fixes
Merge branch 'sqlcipher' of github.com:swizzler/peewee into sqlcipher