Pull from gh
added rvm stuff
added localhost to mac /etc/hosts, so I don't get the same java problem again
Merge branch 'master' of github.com:edwelker/nix_conf