Using $VIRTUAL_ENV to set virtualenv prompt
Merge pull request #187 from manojlds/virtualenvprompt

Using $VIRTUAL_ENV to set virtualenv prompt
Fixed ls alias to use --color=auto instead of --color=always.
Added Jitsu aliases.
'git pull --rebase' alias
Create plugins/enabled directory if it doesn't already exist

- This fixes a bug I saw after installing bash-it on Mac OS X 10.6.8.
  During bash-it installation I chose not to install any plugins. After
  install, when `bash-it enable plugin foo` was complaining that the
  enabled directory did not exist.
Merge pull request #193 from upgradingdave/small-fix-ensure-enabled-dir-exists

Create plugins/enabled directory if it doesn't already exist
Added OSX utility shortcuts

.DS_Store cleaner (recursive)
See who's connected to your itunes library
Flush dns cache.
Added some awesome git aliases for statistics, history, and seeing what changed.
fixed: hg branch grep+awk problem #197
Adds write permission test on ~/.bash_profile prior to backup attempt. Fixes #199.
Merge pull request #200 from sgerrand/ignore-bash_profile-if-nonexistent

Adds write permission test on ~/.bash_profile prior to backup attempt
Merge pull request #198 from conrado/master

small fix for #197
Merge pull request #192 from robb1e/master

"git pull --rebase" alias
Merge pull request #191 from fizerkhan/master

Jitsu aliases
Merge remote-tracking branch 'markrickert/master'

Conflicts:
	aliases/available/git.aliases.bash
Merge pull request #190 from spauka/master

Use ls --color=auto
Fix typo in general.aliases.bash.
Merge pull request #205 from thusoy/patch-1

Fix typo in general.aliases.bash.