Changes made over last couple of months.
Merge branch 'master' of github.com:szywon/dotfiles

Conflicts:
	emacs/fns.el
	emacs/init.el