Emacs - join lines
Merge branch 'master' of github.com:colbell/dotfiles