Added RVM to dot files
Merge branch 'master' of github.com:NeuralSandwich/home

Conflicts:
	Makefile