Added emacs support on Mac
Merge branch 'master' of github.com:elguntor/home

Conflicts:
	.bashrc
vim slim update