Merge branch 'master' of https://github.com/Matir/skel

dotfiles/bashrc

@@ -40,5 +40,3 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
 fi
 
 if [[ -e $HOME/.aliases ]] ; then source $HOME/.aliases ; fi
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting

dotfiles/profile

@@ -13,3 +13,5 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
   export GPG_TTY=`tty`
 fi
 # End GPG
+
+test -f "${HOME}/.profile.local" && . "${HOME}/.profile.local"

dotfiles/xsessionrc

@@ -1,2 +1,3 @@
 setxkbmap -option ctrl:nocaps
+test -f "$HOME/.env" && "$HOME/.env"
 test -f "$HOME/.profile" && . "$HOME/.profile"

dotfiles/zshrc

@@ -56,5 +56,3 @@ fi
 
 # Load any local settings
 if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting