diff --git a/etc/bash_profile b/etc/bash_profile
index 99488e4..e372d93 100644
--- a/etc/bash_profile
+++ b/etc/bash_profile
@@ -28,6 +28,10 @@ fi
 # Load in .bashrc -------------------------------------------------
 source ~/.bashrc
 
+if [ -f ~/.bashrc_local ]; then
+	source ~/.bashrc_local
+fi
+
 
 
 # Hello Messsage --------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index 06142a3..9409a3a 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -41,7 +41,9 @@ export HISTCONTROL=ignoredups
 export HISTFILESIZE=3000
 export HISTIGNORE="ls:cd:[bf]g:exit:..:...:ll:lla"
 alias h=history
-alias hf='history | g'
+hf(){ 
+  grep "$@" ~/.bash_history
+}
 
 
 
@@ -71,8 +73,7 @@ source ~/cl/bin/git-completion.bash
   #git status 2> /dev/null | grep -c : | awk '{if ($1 > 0) print "⚡"}'
 #}
 
-prompt_func()
-{
+prompt_func() {
     previous_return_value=$?;
     prompt="${COLOR_GREEN}\w${COLOR_GRAY}$(__git_ps1)${COLOR_NC}\[\033]0;\u@\h: \w\007\] "
     #prompt="${COLOR_GREEN}\w${COLOR_NC}$(__git_ps1)${COLOR_YELLOW}$(git_dirty_flag)${COLOR_NC} "
diff --git a/etc/irbrc b/etc/irbrc
index 5815da1..3cb2456 100644
--- a/etc/irbrc
+++ b/etc/irbrc
@@ -1,7 +1,6 @@
 # Awesome IRB (mod'd) file from http://github.com/logankoester/irbrc
 # Setup:
-# sudo gem install wirble
-# sudo gem install what_methods
+# sudo gem install wirble what_methods
 
 # Make gems available
 require 'rubygems'
diff --git a/etc/vim/vimrc b/etc/vim/vimrc
index e83f6bd..a23f26d 100644
--- a/etc/vim/vimrc
+++ b/etc/vim/vimrc
@@ -97,6 +97,7 @@ colorscheme ir_black
 set showcmd
 set ruler " Show ruler
 "set ch=2 " Make command line two lines high
+match CursorColumn '\%120v.*' " Show error format when a line is longer than 120 chars
 
 
 " Line Wrapping ***************************************************************