removed Flask for now, updated alembic, updated models
Merge remote-tracking branch 'origin/master'