Add global rvm to path
mpd alias
Merge branch 'master' of github.com:unceus/dotfiles

Conflicts:
	.bashrc