Adopt vimrc and rename bashrc to bashprofile
Adopt vimrc
Merge branch 'master' of github.com:mitch000001/dotfiles

Conflicts:
	vimrc