Added time and note when finished TODO item.
'time and 'note for org-mode are mutually exclusive.
Merge branch 'master' of https://github.com/bsamek/emacs

Conflicts:
	init.el