Add textobj plugin
Add pry snippet
Change git editor to vim
Merge branch 'master' of https://github.com/pcasaretto/dotfiles

Conflicts:
	iTerm/com.googlecode.iterm2.plist