bumps
Merge branch 'master' of github.com:tomasherman/dotfiles

Conflicts:
	emacs/emacs.d.link
merge