Removed custom.bash and am now completely ignoring all files within the custom directory. Started de-macify to provide more support for linux (thanks to alsemyonov on github).

plugins/base.plugin.bash

@@ -3,9 +3,14 @@
 # Desktop Programs
 alias fireworks="open -a '/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app'"
 alias photoshop="open -a '/Applications/Adobe Photoshop CS3/Adobe Photoshop.app'"
-alias preview="open -a '/Applications/Preview.app'"
+alias preview="open -a '$PREVIEW'"
 alias xcode="open -a '/Developer/Applications/Xcode.app'"
 alias filemerge="open -a '/Developer/Applications/Utilities/FileMerge.app'"
 alias safari="open -a safari"
 alias firefox="open -a firefox"
-alias dashcode="open -a dashcode"
+alias dashcode="open -a dashcode"
+
+
+if [ -s /usr/bin/firefox ] ; then
+  unalias firefox
+fi

plugins/git.plugin.bash

@@ -7,7 +7,6 @@ alias gs='git status'
 alias gl='git pull'
 alias gup='git fetch && git rebase'
 alias gp='git push'
-alias gd='git diff | mate'
 alias gdv='git diff -w "$@" | vim -R -'
 alias gc='git commit -v'
 alias gca='git commit -v -a'
@@ -16,6 +15,20 @@ alias gba='git branch -a'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
 
+case $OSTYPE in
+  linux*)
+    alias gd='git diff | vim -R -'
+    ;;
+  darwin*)
+    alias gd='git diff | mate'
+    ;;
+  darwin*)
+    alias gd='git diff'
+    ;;
+esac
+
+
+
 function git-help() {
   echo "Git Custom Aliases Usage"
   echo