Add rvmrc
Add couchapp
Updated vim
Updated vim
Updated vim
Fix conflict
Fix Rakefile syntax
Merge branch 'master' of github.com:DSIW/dotfiles
Add LOCALE export
Add custom oh-my-zsh plugin zsh-syntax-highlighting
Use minimal git status
Set autorebase for git
Add alias for counting shortlog
Add word-diff flag for diffing with git
Add autocorrection in git
Add undo alias
Declare default push as simple
Add mergeoptions for non-fast-forward and auto commit
Fix saving with <c-s> in vim
Only one instance of GVIM will be used