Updates for Vim and Android.
Updated dirs.
Updates man.
Made things a bit more visual.
Updated tmux + android plugin.
Merge remote-tracking branch 'upstream/master' into HEAD

* upstream/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.

Conflicts:
	aliases/available/git.aliases.bash
Merge branch 'master' of github.com:jalcine/bash-it into HEAD

* 'master' of github.com:jalcine/bash-it:
  Updated Android + CMake plugins.

Conflicts:
	aliases/available/git.aliases.bash
	plugins/available/android.plugin.bash