diff --git a/bashrc b/bashrc
index 35ca618..37c80ed 100644
--- a/bashrc
+++ b/bashrc
@@ -22,10 +22,10 @@ function tmux_title {
 }
 #tmux_title $(hostname -s)
 
-if [ -f ~/git/homedir-config/hosts/$(hostname -s)/bashrc ] ; then
-  source ~/git/homedir-config/hosts/$(hostname -s)/bashrc
+if [ -f ~/git/dotfiles/hosts/$(hostname -s)/bashrc ] ; then
+  source ~/git/dotfiles/hosts/$(hostname -s)/bashrc
 else
-  source ~/git/homedir-config/hosts/any/bashrc
+  source ~/git/dotfiles/hosts/any/bashrc
 fi
 
 if type nvim &>/dev/null ; then
@@ -41,6 +41,20 @@ export LESS='-R'
 export TERM=xterm-256color
 export MC_SKIN=$HOME/.mc/lib/solarized.ini
 
+# Better History
+HISTFILE=~/.bash_history
+HISTSIZE=100000
+HISTTIMEFORMAT="%F %T "
+HISTCONTROL='ignorespace:ignoredups'
+HISTIGNORE='l:ls:history'
+
+# append to history, don't overwrite it
+shopt -s histappend
+# attempt to save all lines of a multiple-line command in the same history entry
+shopt -s cmdhist
+# save multi-line commands to the history with embedded newlines
+shopt -s lithist
+
 #if [ -e ~/.local/bin/virtualenvwrapper.sh ] ; then
 #		# Python stuff
 #		export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3