cg - mostly updates to diary input
Merge branch 'master' of https://github.com/undashes/beerd

Conflicts:
	views/diary.jade
	views/history.jade