Add vim-jekyll
Don't auto-open NERDTree
Merge branch 'master' of github.com:jlindsey/vim

Conflicts:
	.gitmodules