put plugin and general settings back in vimrc
added folding
Merge branch 'master' of https://github.com/jubalh/dotfiles