Add local bash_aliases, bundle exec alias, fix typo

.bash_aliases

@@ -1,6 +1,12 @@
+if [ -f ~/.bash_local_aliases ]; then
+    . ~/.bash_local_aliases
+fi
+
 alias grep="grep --color=auto"
 alias c="clear"
 
+alias be="bundle exec"
+
 # Easier APT
 alias install="sudo apt-get install"
 alias purge="sudo apt-get purge"
@@ -30,7 +36,7 @@ alias gco="git checkout"
 alias gcm="git checkout master"
 alias gpom="git pull origin master"
 alias gbd="git branch -D"
-alais gm="git mergetool"
+alias gm="git mergetool"
 
 # Editing files
 alias aliases="vim ~/.bash_aliases"

.zshrc

@@ -67,4 +67,6 @@ PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
 
 ### Added by the Heroku Toolbelt
 export PATH="/usr/local/heroku/bin:$PATH"
-export PATH=/opt/sbt/bin:$PATH
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"  # This loads RVM