Add diffconflicts mergetool
Move .environment

Why did I do this?
Add rvm to PATH

Sadtimes