Expanded a few definitions in _vimrc.
Merge branch 'master' of github.com:ashishb/dotfiles

* 'master' of github.com:ashishb/dotfiles:
  Improved _bashrc for android related stuff.
  Fix path to dex2jar.
  Fix vimrc for Mac (conditional install for Linux)
Fix "cf"