set 25 spaces as resize value for tmux splits
set new colors for cursorline and linenr
new location for grep on macosx mavericks
Merge remote-tracking branch 'github/master'