diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 75b8f65..ab86853 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -11,6 +11,8 @@
 alias gs='git status'
 alias gss='git status -s'
 alias gl='git pull'
+alias gpr='git pull --rebase'
+alias gpp='git pull && git push'
 alias gup='git fetch && git rebase'
 alias gp='git push'
 alias gpo='git push origin'
@@ -27,6 +29,10 @@
 alias gdel='git branch -D'
 alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
 alias gll='git log --graph --pretty=oneline --abbrev-commit'
+alias gg="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+alias ggs="gg --stat"
+alias gsl="git shortlog -sn"
+alias gw="git whatchanged"
 
 if [ -z "$EDITOR" ]; then
     case $OSTYPE in
diff --git a/aliases/available/jitsu.aliases.bash b/aliases/available/jitsu.aliases.bash
new file mode 100644
index 0000000..91e9684
--- /dev/null
+++ b/aliases/available/jitsu.aliases.bash
@@ -0,0 +1,49 @@
+cite 'about-alias'
+about-alias 'jitsu task abbreviations'
+
+# jitsu
+alias j='jitsu'
+alias jl='jitsu login'
+alias jo='jitsu logout'
+
+# deploy and update
+alias jd='jitsu apps deploy'
+alias ju='jitsu apps update'
+
+# new and start, restart, stop
+alias jn='jitsu apps create'
+alias js='jitsu apps start'
+alias jr='jitsu apps restart'
+alias jx='jitsu apps stop'
+
+# logs
+alias jll='jitsu logs'
+alias jlog='jitsu logs'
+alias jlogs='jitsu logs'
+
+# env
+alias je='jitsu env'
+alias jel='jitsu env list'
+alias jes='jitsu env set'
+alias jeg='jitsu env get'
+alias jed='jitsu env delete'
+alias jec='jitsu env clear'
+alias jesv='jitsu env save'
+alias jeld='jitsu env load'
+
+# configuration
+alias jc='jitsu conf'
+alias jcl='jitsu config list'
+alias jcs='jitsu config set'
+alias jcg='jitsu config get'
+alias jcd='jitsu config delete'
+
+#  list and install, view
+alias jls='jitsu list'
+alias jin='jitsu install'
+alias jv='jitsu apps view'
+
+# Database, Snapshots and Tokens
+alias jdb='jitsu databases'
+alias jss='jitsu snapshots'
+alias jto='jitsu tokens'
diff --git a/aliases/available/osx.aliases.bash b/aliases/available/osx.aliases.bash
index e234727..3d82b50 100644
--- a/aliases/available/osx.aliases.bash
+++ b/aliases/available/osx.aliases.bash
@@ -23,3 +23,12 @@
 
 # Requires growlnotify, which can be found in the Growl DMG under "Extras"
 alias grnot='growlnotify -s -t Terminal -m "Done"'
+
+# Get rid of those pesky .DS_Store files recursively
+alias dsclean='find . -type f -name .DS_Store -print0 | xargs -0 rm'
+
+# Track who is listening to your iTunes music
+alias whotunes='lsof -r 2 -n -P -F n -c iTunes -a -i TCP@`hostname`:3689'
+
+# Flush your dns cache
+alias flush='dscacheutil -flushcache'
diff --git a/install.sh b/install.sh
index 0f1da39..46edcf2 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 BASH_IT="$HOME/.bash_it"
 
-cp $HOME/.bash_profile $HOME/.bash_profile.bak
-
-echo "Your original .bash_profile has been backed up to .bash_profile.bak"
+test -w $HOME/.bash_profile &&
+  cp $HOME/.bash_profile $HOME/.bash_profile.bak &&
+  echo "Your original .bash_profile has been backed up to .bash_profile.bak"
 
 cp $HOME/.bash_it/template/bash_profile.template.bash $HOME/.bash_profile
 
diff --git a/lib/helpers.bash b/lib/helpers.bash
index e1787fe..b99ae3d 100644
--- a/lib/helpers.bash
+++ b/lib/helpers.bash
@@ -277,6 +277,8 @@
             return
         fi
 
+        mkdir -p $BASH_IT/$subdirectory/enabled
+
         ln -s $BASH_IT/$subdirectory/available/$plugin $BASH_IT/$subdirectory/enabled/$plugin
     fi
 
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 18c6c9d..5a5edd3 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -108,8 +108,8 @@
     fi
     SCM_PREFIX=${HG_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
     SCM_SUFFIX=${HG_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
-    SCM_BRANCH=$(hg summary 2> /dev/null | grep branch | awk '{print $2}')
-    SCM_CHANGE=$(hg summary 2> /dev/null | grep parent | awk '{print $2}')
+    SCM_BRANCH=$(hg summary 2> /dev/null | grep branch: | awk '{print $2}')
+    SCM_CHANGE=$(hg summary 2> /dev/null | grep parent: | awk '{print $2}')
 }
 
 function rvm_version_prompt {