Add indent-line
Merge branch 'master' of github.com:greatghoul/vimrc

Conflicts:
	bundle/indent-line