update emacs
Merge branch 'master' of github.com:shanejonas/dotfiles

Conflicts:
	emacs/emacs.symlink
Merge branch 'master' of github.com:shanejonas/dotfiles
set cmdheight to 1