diff --git a/bashrc/ubuntu.bashrc b/bashrc/ubuntu.bashrc
index 400a60b..cee5187 100644
--- a/bashrc/ubuntu.bashrc
+++ b/bashrc/ubuntu.bashrc
@@ -197,3 +197,4 @@ eval "$(direnv hook bash)"
 
 # Don't install gems globally, that would be chaos for file permissions
 export GEM_HOME="$HOME/.gems" PATH="$HOME/.gems/bin:$PATH"
+source "/home/gildedguy/.bashbox/env";
diff --git a/zshrc/ubuntu.zshrc b/zshrc/ubuntu.zshrc
index da12c69..0104be5 100644
--- a/zshrc/ubuntu.zshrc
+++ b/zshrc/ubuntu.zshrc
@@ -131,7 +131,7 @@ else
 	*) export EDITOR="nano" ;;
 	esac
 fi
-#export GIT_EDITOR=$EDITOR
+export GIT_EDITOR="nano" # why not?
 
 # As long as possible, attempt to setup our GnuPG agent when we're on an SSH session.
 if [[ -n "$SSH_CLIENT" ]] || [[ -n "$SSH_TTY" ]]; then
@@ -203,3 +203,4 @@ source $ZSH/oh-my-zsh.sh
 
 ### Oh My ZSH init stuff ends here ###
 
+source "/home/gildedguy/.bashbox/env";