Merge branch 'master' of https://github.com/rtsmith/dotfiles

* 'master' of https://github.com/rtsmith/dotfiles:
  Add folding behaviour to vimrc
Touch
Merge branch 'master' of https://github.com/rtsmith/dotfiles

* 'master' of https://github.com/rtsmith/dotfiles: