replace GUI emacs by emacs -nw
Merge branch 'master' of https://github.com/ZhimingWang/dotfiles-ubuntu

Server side ubuntu-dotfiles are for a CLI install. In the case of guise,
a GUI install, things could be a little different. (For instance, emacs
need the extra -nw option.)