diff --git a/.bash_profile b/.bash_profile
index 952b386..4c60dd8 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -9,6 +9,10 @@ if [ -f $(brew --prefix)/etc/bash_completion ]; then
   . $(brew --prefix)/etc/bash_completion
 fi
 
+if [ -f ~/.bash_local ]; then
+  . ~/.bash_local
+fi
+
 # came from Aaron Lasseigne (AaronLasseigne on GitHub)
 battery_status()
 {
@@ -35,5 +39,5 @@ battery_status()
   fi
 }
 
-export PROMPT_COMMAND='PS1="$(battery_status) \h:\W \u\$ "'
+export PROMPT_COMMAND='PS1="$(battery_status) [\d \t] \h:\W \u\$ "'
 
diff --git a/.inputrc b/.inputrc
new file mode 100644
index 0000000..1221bb9
--- /dev/null
+++ b/.inputrc
@@ -0,0 +1,2 @@
+set editing-mode vi
+set keymap vi