Vendor tmuxinator
Update rbenv and ruby-build
Set git user to lewis@lmars.net
Add git merge aliases
Update Vim Ruby syntax check to use correct Ruby version