Updated emacs
Merge branch 'master' of github.com:hamstah/dotfiles
Added aliases