been a long time...
Merge branch 'master' of https://github.com/sabraham/dotfiles

Conflicts:
	bashrc
	emacs