no rvm > dev null on start
Merge branch 'master' of github.com:mil/home

Conflicts:
	.config/fish/config.fish
Merge branch 'master' of github.com:mil/home
modified launchrc