Make permalinks work
Merge branch 'master' of https://github.com/step21/poerelief

Conflicts:
	poerelief/static/javascripts/app.js