Bo Jeanes 7f38aeedb2 Merge branch 'master' of git://github.com/bjeanes/dot-files ... * 'master' of git://github.com/bjeanes/dot-files: Fix psql function Remove unused/annoying functions and set default JRuby options Move osx-specific alias to the osx-only shell file Remove unused aliases Refactor git configs to use include files. Latest vundle Add include path for local git config Change git name Change cursor to I-bar in insert mode even when in Tmux augroups Extra mappings Conflicts: Rakefile editors/vim/bundles.vim		2012-08-16 17:10:05 -05:00
..
vim	Merge branch 'master' of git://github.com/bjeanes/dot-files	2012-08-16 17:10:05 -05:00