added clause for running in no windowing system, change x default font
Merge branch 'devel'
Merge branch 'master' of github.com:jtecca/work-emacs