removing folding, its pretty annoying in most cases
Merge branch 'master' of github.com:kmfk/dotfiles
Fixing merge