Rmeoved emacs -nw alias.
Use urxvt as terminal.
Start emacs in gui mode.
Merge branch 'master' into gondwana