Add sqlalchemy as a requirement
Merge branch 'master' into database
Convert to sqlalchemy models