Should fix #47
Refactor to use i18n
cleanup
Merge branch 'master' into stevegutz-master

Conflicts:
	app/views/chapter/base/_header.html.slim