Settings redesign
Merge branch 'master' of https://github.com/mjfuller/digestible

Conflicts:
	templates/consumer.html