Troubleshoot vim hangs by removing some plugins
Merge branch 'master' of github.com:ernie/dotvim

Conflicts:
	bundle/tlib_vim
	bundle/ultisnips