working with latest xolox shell.vim
Merge branch 'devel' of https://github.com/ralesi/vundle into devel
reformat and clean up last commit