Merge remote-tracking branch 'upstream/master'

aliases/available/osx.aliases.bash

@@ -17,6 +17,7 @@ alias fh='open -a Finder .'
 alias textedit='open -a TextEdit'
 alias hex='open -a "Hex Fiend"'
 alias skype='open -a Skype'
+alias mou='open -a Mou'
 
 if [ -s /usr/bin/firefox ] ; then
   unalias firefox

plugins/available/docker.plugin.bash

@@ -0,0 +1,8 @@
+cite about-plugin
+about-plugin 'Helpers to get Docker setup correctly for boot2docker'
+
+# Note, this might need to be different if you have an older version
+# of boot2docker, or its configured for a different IP
+if [[ `uname -s` == "Darwin" ]]; then
+  export DOCKER_HOST=tcp://192.168.59.103:2375
+fi

plugins/available/pyenv.plugin.bash

@@ -0,0 +1,14 @@
+cite about-plugin
+about-plugin 'load pyenv, if you are using it'
+
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+[[ `which pyenv` ]] && eval "$(pyenv init -)"
+
+#Load pyenv virtualenv if the virtualenv plugin is installed.
+if pyenv virtualenv-init - &> /dev/null; then
+  eval "$(pyenv virtualenv-init -)"
+fi
+
+# Load the auto-completion script if pyenv was loaded.
+[[ -e $PYENV_ROOT/completions/pyenv.bash ]] && source $PYENV_ROOT/completions/pyenv.bash