Added rvm path and removed the vim stuff
Merged and updated gitignore