moved vimrc
Merge branch 'master' of https://github.com/ManOfTeflon/config

Conflicts:
	.bashrc