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

Conflicts:
	home/.vimrc
added .vimrc