Update ctrlp
Update nerdtree
Add vim-dispatch
Update vim-ruby
Update vim-rails
Update vim-slim remote and update
Merge branch 'master' of github.com:zacstewart/dotfiles

Conflicts:
	.gitmodules