remove rvm. add git merge tool
Merge branch 'master' of github.com:ngzax/dot

Conflicts:
	bash_profile
default push to current branch
Merge branch 'master' of github.com:ngzax/dot

Conflicts:
	gitconfig