removed old config
New vim configuration
Merge branch 'master' of github.com:niclashoyer/dotfiles

Conflicts:
	.gvimrc
	.oh-my-zsh