update profile / vimrc
Merge branch 'master' of github.com:tzangms/dotfiles

Conflicts:
	profile
	vimrc