Merge branch 'release/0.2.4' into develop
Include templates and alembic stuff.
0.2.5
Merge branch 'release/0.2.5'