* '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
* Only symlinking files that need to be in ~/ by the application that uses them. Re-wired everything to source other files directly from ~/.config
* Moved all files into folders grouping (approximately) by purpose
* Refactored some bash files to source so that I can include in some of them into ZSH too
* Started on my ZSH prompt
* Added vcprompt.py which replaces __git_ps1() type functionality. It works in all shells (as it is a separate binary), is quite fast, and support multiple VCSes
TODO:
* Make Bash and ZSH prompts as close as possible, ideally using the same configuration file for all the common parts
* Make fish prompt use vcprompt.py