kaleidoscope vs vimdiff
Merge remote-tracking branch 'github'
Merge branch 'master' of github.com:schaarschmidt/dot-files
overload grep by the_silver_surfer
set ORACLE_HOME and LD_LIBRARY_PATH on umt.itz