Merge 381888159e into 057755a91b

.gitignore

@@ -4,6 +4,7 @@ custom/*
 !custom/example.bash
 .rvmrc
 aliases/custom.aliases.bash
+completion/custom.completion.bash
 lib/custom.bash
 plugins/custom.plugins.bash
 *.swp

aliases/available/osx.aliases.bash

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

bash_it.sh

@@ -38,17 +38,16 @@ do
   source $config_file
 done
 
-# Load enabled aliases, completion, plugins
+# Load enabled and custom aliases, completion, plugins
 for file_type in "aliases" "completion" "plugins"
 do
   _load_bash_it_files $file_type
-done
 
-# Load any custom aliases that the user has added
-if [ -e "${BASH_IT}/aliases/custom.aliases.bash" ]
-then
-  source "${BASH_IT}/aliases/custom.aliases.bash"
-fi
+  if [ -e "${BASH_IT}/${file_type}/custom.${file_type}.bash" ]
+  then
+    source "${BASH_IT}/${file_type}/custom.${file_type}.bash"
+  fi
+done
 
 # Custom
 CUSTOM="${BASH_IT}/custom/*.bash"