Test that the markdown version in use is safe
Remove stray diff
(Ported 40e3c6bbeb99bc1a1772d82859d244cc2af8fc14 from adhocracy.hhu_theme)
pep8 / pyflakes

Make most files compliant with newest versions of pep8 (1.4.1) and
pyflakes (0.6.1), using flake8 and vim-flake8
Merge branch 'develop' of ssh://github.com/liqd/adhocracy into develop
Remove fanstatic_url helper
Surprisingly, removing this chunk of code has no effect. I could not find any usage of fanstatic_url, tests pass, and everything looks as before
Remove commented-out block of code
Ignore temporary journal files
Construct fanstatic base url like any other base URL (Closes adhocracy.hhu_theme#100 )
Merge pull request #207 from phihag/remove_fanstatic_urlhelper

Remove fanstatic_url helper
Upgrade SQLAlchemy (0.7.9 -> 0.7.10)
Merge branch 'develop' into feature-thumbnail_badges_#191_hierarchical_badge_#95

Conflicts:
	adhocracy/controllers/badge.py
	adhocracy/controllers/instance.py
	adhocracy/lib/pager.py
	adhocracy/lib/util.py
	adhocracy/model/__init__.py
	adhocracy/model/instance.py
	adhocracy/static/__init__.py