diff --git a/.gitignore b/.gitignore
index 6be7eef..33e5fca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+aliases/enabled
 plugins/enabled
 .DS_Store
 custom/*.bash
diff --git a/aliases/emacs.aliases.bash b/aliases/available/emacs.aliases.bash
similarity index 100%
rename from aliases/emacs.aliases.bash
rename to aliases/available/emacs.aliases.bash
diff --git a/aliases/general.aliases.bash b/aliases/available/general.aliases.bash
similarity index 100%
rename from aliases/general.aliases.bash
rename to aliases/available/general.aliases.bash
diff --git a/aliases/git.aliases.bash b/aliases/available/git.aliases.bash
similarity index 100%
rename from aliases/git.aliases.bash
rename to aliases/available/git.aliases.bash
diff --git a/aliases/heroku.aliases.bash b/aliases/available/heroku.aliases.bash
similarity index 100%
rename from aliases/heroku.aliases.bash
rename to aliases/available/heroku.aliases.bash
diff --git a/aliases/hg.aliases.bash b/aliases/available/hg.aliases.bash
similarity index 100%
rename from aliases/hg.aliases.bash
rename to aliases/available/hg.aliases.bash
diff --git a/aliases/homebrew.aliases.bash b/aliases/available/homebrew.aliases.bash
similarity index 100%
rename from aliases/homebrew.aliases.bash
rename to aliases/available/homebrew.aliases.bash
diff --git a/aliases/jekyll.aliases.bash b/aliases/available/jekyll.aliases.bash
similarity index 100%
rename from aliases/jekyll.aliases.bash
rename to aliases/available/jekyll.aliases.bash
diff --git a/aliases/osx.aliases.bash b/aliases/available/osx.aliases.bash
similarity index 100%
rename from aliases/osx.aliases.bash
rename to aliases/available/osx.aliases.bash
diff --git a/aliases/rails.aliases.bash b/aliases/available/rails.aliases.bash
similarity index 100%
rename from aliases/rails.aliases.bash
rename to aliases/available/rails.aliases.bash
diff --git a/aliases/textmate.aliases.bash b/aliases/available/textmate.aliases.bash
similarity index 100%
rename from aliases/textmate.aliases.bash
rename to aliases/available/textmate.aliases.bash
diff --git a/aliases/todo.txt-cli.aliases.bash b/aliases/available/todo.txt-cli.aliases.bash
similarity index 100%
rename from aliases/todo.txt-cli.aliases.bash
rename to aliases/available/todo.txt-cli.aliases.bash
diff --git a/aliases/vim.aliases.bash b/aliases/available/vim.aliases.bash
similarity index 100%
rename from aliases/vim.aliases.bash
rename to aliases/available/vim.aliases.bash
diff --git a/bash_it.sh b/bash_it.sh
index d63458a..b52ff97 100644
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -37,12 +37,22 @@
 done
 
 # Aliases
-FUNCTIONS="${BASH}/aliases/*.bash"
+if [ ! -d "${BASH}/aliases/enabled" ]
+then
+  mkdir "${BASH}/aliases/enabled"
+  ln -s ${BASH}/aliases/available/* "${BASH}/aliases/enabled"
+fi
+FUNCTIONS="${BASH}/aliases/enabled/*.bash"
 for config_file in $FUNCTIONS
 do
   source $config_file
 done
 
+if [ -e "${BASH}/aliases/custom.aliases.bash" ]
+then
+  source "${BASH}/aliases/custom.aliases.bash"
+fi
+
 # Custom
 CUSTOM="${BASH}/custom/*.bash"
 for config_file in $CUSTOM