Option format, Emacs word movement
Merge branch 'master' of github.com:sjolsen/dotfiles