Update vimrc, bashrc and bash_profile
Merge branch 'master' of github.com:tzumby/dotfiles

Conflicts:
	vimrc