diff --git a/README.md b/README.md
index 0c9c303f..529c54b9 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
 
 **Bash it** is a mash up of my own bash commands and scripts, other bash stuff I have found. 
 
-(And a shameless ripoff of [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh). :)
+(And a shameless fork from (https://github.com/revans/bash-it). :)
 
 Includes autocompletion, themes, aliases, custom functions, a few stolen pieces from Steve Losh, and more.
 
 ## Install
 
-1. Check a clone of this repo: `git clone http://github.com/revans/bash-it.git ~/.bash_it`
+1. Check a clone of this repo: `git clone http://github.com/noorul/bash-it.git ~/.bash_it`
 2. Run `~/.bash_it/install.sh` (it automatically backs up your `~/.bash_profile`)
 3. Edit your `~/.bash_profile` file in order to customize bash-it.
 
diff --git a/bash_it.sh b/bash_it.sh
index c7cbaa73..fd7b546d 100644
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -22,7 +22,7 @@ for file_type in "aliases" "completion" "plugins"
 do
   if [ ! -d "${BASH}/${file_type}/enabled" ]
   then
-    break
+    continue 
   fi
   FILES="${BASH}/${file_type}/enabled/*.bash"
   for config_file in $FILES
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index 95f481e9..6d5fd4fb 100644
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -17,8 +17,8 @@ export BASH_THEME='bobby'
 export GIT_HOSTING='git@git.domain.com'
 
 # Set my editor and git editor
-export EDITOR="/usr/bin/mate -w"
-export GIT_EDITOR='/usr/bin/mate -w'
+export EDITOR="/usr/local/bin/emacsclient"
+export GIT_EDITOR='/usr/local/bin/emacsclient'
 
 # Set the path nginx
 export NGINX_PATH='/opt/nginx'