.vimrc
Merge branch 'master' of github.com:poeks/dotfiles

Conflicts:
	.vimrc
Git ignore