# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1420490388 18000
# Node ID 0538d5699cd7b5b393e49dd2ce07cd46955fd57c
# Parent  f44901f85f39e947c22c62f7a194675a60a39140# Parent  3b873456c2b3de673bbe001e69059596301a9216
Merge from default

diff --git a/.homedir-setup.rb b/.homedir-setup.rb
--- a/.homedir-setup.rb
+++ b/.homedir-setup.rb
@@ -11,6 +11,10 @@ if `which git` == ''
 end
 
 def main
+  if ARGV.length == 0
+    ARGV << '--help'
+  end
+
   opts = GetoptLong.new(
     [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
     [ '--update', '-u', GetoptLong::NO_ARGUMENT ],
diff --git a/.pentadactylrc b/.pentadactylrc
--- a/.pentadactylrc
+++ b/.pentadactylrc
@@ -6,6 +6,7 @@ group user
 " colorscheme solarized-light
 
 " Firefox's tabs
+hi TabClose	display: none;
 hi TabNumber	color: #fff; margin: 0; padding-right: .3ex; text-shadow: #000 -1px 0 0, #000 0 1px 0, #000 1px 0 0, #000 0 -1px 0;
 
 set guioptions=bCrsn