Merge branch 'master' into gpg-ssh-fix

runcoms/zshrc

@@ -10,17 +10,17 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
-# Package Management Aliases
-if [ -f $HOME/.aliases.pkgman ]
+# Command Specific Aliases
+for i in $HOME/.aliases/command-specific/*
+do
+	if hash $(basename $i) 2>/dev/null
 	then
-  source $HOME/.aliases.pkgman
+		source $i
 	fi
+done
 
-# Aliases
-if [ -f $HOME/.aliases ]
-then
-  source $HOME/.aliases
-fi
+# General Aliases
+source $HOME/.aliases/general
 
 # Various Options
 unsetopt share_history