Upgrading to alembic 0.5.0, moving back to dev
Merge pull request #1222 from selenamarie/upgrade-alembic

Upgrading to alembic 0.5.0, moving back to dev
Merge remote-tracking branch 'upstream/master' into fakedata