Turn off distractions early on
Join line with M-j
Use C-u for insert-iso-date instead of defining two functions
Merge branch 'master' of github.com:sfstpala/.dotfiles

Conflicts:
	emacs-func.el
	emacs-keys.el