Re-enable chruby, change git editor, add vagrant