Merge branch 'release/vim-config'
Merge branch 'develop'
Don't quit NERDTree on File Open
Add Puppet-syntax-vim module to project
Merge branch 'develop'