Makefile cleanup and enough to get to staging
Merge branch 'python' of github:databrary/www into python

Conflicts:
	databrary/pelicanconf.py