# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1255139440 14400
# Node ID eb7cb3d250605ed5f6433b0e0e61387440025b5d
# Parent  a24d5587386f37712f43f9e13c0ab7005d868fd0# Parent  616075bfadb5be8cf056b653b4dc75d009ed81f9
Merge

diff --git a/.elisp/settings/10.require.el b/.elisp/settings/10.require.el
--- a/.elisp/settings/10.require.el
+++ b/.elisp/settings/10.require.el
@@ -13,6 +13,8 @@
 
 (require 'textmate)
 (textmate-mode)
+;; override what makes a project root
+(setq *textmate-project-roots* '(".git" ".hg"))
 
 (require 'yaml-mode)
 (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
diff --git a/.shell.d/00.path_manipulation.sh b/.shell.d/00.path_manipulation.sh
--- a/.shell.d/00.path_manipulation.sh
+++ b/.shell.d/00.path_manipulation.sh
@@ -5,7 +5,7 @@ function insert_path_element() {
 }
 
 function remove_path_element() {
-  remove_path_element $1 PATH
+  remove_element_from_var $1 PATH
 }
 
 function insert_element_into_var () {