diff --git a/.gitignore b/.gitignore
index 32e62de..25042cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 lib/custom.bash
 plugins/custom.plugins.bash
 *.swp
+.*.un~
diff --git a/plugins/available/base.plugin.bash b/plugins/available/base.plugin.bash
index 0447f33..1576ada 100755
--- a/plugins/available/base.plugin.bash
+++ b/plugins/available/base.plugin.bash
@@ -12,7 +12,7 @@
 {
     about checks whether a website is down for you, or everybody
     param 1: website url
-    example $ down4me http://www.google.com
+    example '$ down4me http://www.google.com'
     curl -s "http://www.downforeveryoneorjustme.com/$1" | sed '/just you/!d;s/<[^>]*>//g'
 }
 
@@ -28,7 +28,7 @@
 {
     about picks random line from file
     param 1: filename
-    example $ pickfrom /usr/share/dict/words
+    example '$ pickfrom /usr/share/dict/words'
     local file=$1
     [ -z "$file" ] && reference $FUNCNAME && return
     length=$(cat $file | wc -l)
@@ -41,8 +41,8 @@
     about generates random password from dictionary words
     param optional integer length
     param if unset, defaults to 4
-    example $ pass
-    example $ pass 6
+    example '$ pass'
+    example '$ pass 6'
     local i pass length=${1:-4}
     pass=$(echo $(for i in $(eval echo "{1..$length}"); do pickfrom /usr/share/dict/words; done))
     echo "With spaces (easier to memorize): $pass"
@@ -53,7 +53,7 @@
 {
     about preview markdown file in a browser
     param 1: markdown file
-    example $ pmdown README.md
+    example '$ pmdown README.md'
     if command -v markdown &>/dev/null
     then
       markdown $1 | browser
@@ -66,8 +66,8 @@
 {
     about make a directory and cd into it
     param path to create
-    example $ mkcd foo
-    example $ mkcd /tmp/img/photos/large
+    example '$ mkcd foo'
+    example '$ mkcd /tmp/img/photos/large'
     mkdir -p "$*"
     cd "$*"
 }
@@ -83,7 +83,7 @@
 {
     about view man documentation in Preview
     param 1: man page to view
-    example $ pman bash
+    example '$ pman bash'
     man -t "${1}" | open -f -a $PREVIEW
 }
 
@@ -92,7 +92,7 @@
 {
     about download file and Preview it
     param 1: download URL
-    example $ pcurl http://www.irs.gov/pub/irs-pdf/fw4.pdf
+    example '$ pcurl http://www.irs.gov/pub/irs-pdf/fw4.pdf'
     curl "${1}" | open -f -a $PREVIEW
 }
 
@@ -100,7 +100,7 @@
 {
     about display information about Ruby classes, modules, or methods, in Preview
     param 1: Ruby method, module, or class
-    example $ pri Array
+    example '$ pri Array'
     ri -T "${1}" | open -f -a $PREVIEW
 }
 
@@ -153,7 +153,7 @@
 {
     about checks for existence of a command
     param 1: command to check
-    example $ command_exists ls && echo 'exists'
+    example '$ command_exists ls && echo exists'
     type "$1" &> /dev/null ;
 }
 
diff --git a/plugins/available/rbenv.plugin.bash b/plugins/available/rbenv.plugin.bash
index bd3f78e..c45d714 100644
--- a/plugins/available/rbenv.plugin.bash
+++ b/plugins/available/rbenv.plugin.bash
@@ -2,7 +2,7 @@
 
 # Load rbebv, if you are using it
 export PATH="$HOME/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
+[[ `which rbenv` ]] && eval "$(rbenv init -)"
 
 # Load the auto-completion script if rbenv was loaded.
-source ~/.rbenv/completions/rbenv.bash
+[[ -e ~/.rbenv/completions/rbenv.bash ]] && source ~/.rbenv/completions/rbenv.bash
\ No newline at end of file
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 15bd4aa..f096fda 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -31,7 +31,7 @@
 RBFU_THEME_PROMPT_SUFFIX='|'
 
 function scm {
-  if [[ -d .git ]]; then SCM=$SCM_GIT
+  if [[ -f .git/HEAD ]]; then SCM=$SCM_GIT
   elif [[ -n "$(git symbolic-ref HEAD 2> /dev/null)" ]]; then SCM=$SCM_GIT
   elif [[ -d .hg ]]; then SCM=$SCM_HG
   elif [[ -n "$(hg root 2> /dev/null)" ]]; then SCM=$SCM_HG