Add Vim-Indent-Guides

Update Plugins
Merge branch 'master' of https://github.com/teuffel/.vim

Conflicts:
	.gitmodules
	bundle/powerline