$ changes to # if vi mode is active.
Merge branch 'master' of github.com:LauriM/dotfiles