Merge branch 'master' of github.com:senior7515/.emacs.d

* 'master' of github.com:senior7515/.emacs.d:
  latest pull from emacs broke my title bar. fix later