Added indent guides and marker for continued lines in vim
Merge branch 'master' of https://github.com/thomasloven/dotfiles

Conflicts:
	.gitmodules