Updated Android + CMake plugins.
Merge remote-tracking branch 'refs/remotes/origin/master'

* refs/remotes/origin/master:
  Add pip completion
  Fix typo in general.aliases.bash.
  Adds write permission test on ~/.bash_profile prior to backup attempt. Fixes #199.
  fixed: hg branch grep+awk problem #197
  Added some awesome git aliases for statistics, history, and seeing what changed.
  Added OSX utility shortcuts
  'git pull --rebase' alias
  Added Jitsu aliases.
  Fixed ls alias to use --color=auto instead of --color=always.