Add rbenv to path
Extricate RVM
Add git aliases for managing 'assume unchanged', shapshot and ours/theirs merges