Preliminary changes for Powerline
Merge branch 'master' of https://github.com/dogrover/dotfiles

Conflicts:
	.gitignore
	vim/vimrc