addded emacs alias
Merge branch 'master' of ssh://github.com/nbren12/dotfiles

Conflicts:
	zsh/oh-my-zsh