Revert "[vim] added cdiff file recognition"

This reverts commit 75458c431660279e71685ef282308ae923e7ba9b.
added enca to system_setup and sorted brew libs
[ruby] added require_dir function to .irbrc
[bash] added GOPATH to .bashrc
Merge branch 'master' of github.com:masukomi/masuconfigs

* 'master' of github.com:masukomi/masuconfigs:
  [vim] changed highlight color of cursorline and cursorcolumn
  [vim] changed limp's highlight color of bracket block
  [bashrc] removed another cleandiff aliaus and added utest
  [vim] replaced Powerline with vim-airline and switched font
  added vimr executable for use with Vimr app

Conflicts:
	.bashrc
	.vim/bundle/Conque-Shell
	.vim/filetype.vim
... merging in changes from upstream and stash
switched font in .vimrc