pep8
update alembic (0.6.4 -> 0.6.5)

This fixes a bug in --autogenerate, which is relevant for us.
fix category template titles
fix static template titles
Merge branch 'develop' into geo
Pin geoalchemy2 to 0.2.4

This is required to remain compatible with SQLAlchemy 0.9.4.
Add alembic migration adding all the geo stuff