Fix vimrc for Mac (conditional install for Linux)
Fix path to dex2jar.
Merge branch 'master' of github.com:ashishb/dotfiles

* 'master' of github.com:ashishb/dotfiles:
  Improved setup new ubuntu machine
  Add pylint.
  Do word level diff.
  Show indentation more clearly.