Version bump.
Merge branch 'master' into dev

Conflicts:
	cmd/hekad/main.go