I should commit more often...

  * Change zsh prompt
  * Add sass/compass to ack config
  * Add new autotest images
  * Simplify autotest config
  * Simplify screenrc
  * Add aliases to most common Ruby/Rails commands to preface
    with 'bundle exec' when a Gemfile exists for a project

.gitmodules

@@ -16,3 +16,9 @@
 [submodule "submodules/histwin.vim"]
 	path = submodules/histwin.vim
 	url = http://github.com/chrisbra/histwin.vim.git
+[submodule "submodules/vim-haml"]
+	path = submodules/vim-haml
+	url = http://github.com/tpope/vim-haml.git
+[submodule "submodules/vim-cucumber"]
+	path = submodules/vim-cucumber
+	url = http://github.com/tpope/vim-cucumber.git

all/ackrc

@@ -4,7 +4,8 @@ less -r
 ruby=.haml
 --type-add
 css=.sass
+--type-add
+css=.scss
 --ruby
 --css
 --js
-

all/autotest

@@ -1,10 +1,10 @@
 require 'autotest/fsevent'
 require 'autotest/timestamp'
-require 'autotest/screen'
 require 'autotest/restart'
-require 'autotest/redgreen'
+#require 'autotest/screen'
+#require 'autotest/redgreen'
 
-Autotest::Screen.statusline = ''
+#Autotest::Screen.statusline = ''
 
 AUTOTEST_IMAGE_PATH = File.join(File.dirname(__FILE__),".autotest_images")
 
@@ -26,11 +26,11 @@ module Autotest::Growl
 
     if failed.to_i > 0
       cnt = [(9 + failed.to_i) / 10 * 10, 50].min
-      growl "Test Results", "#{output}", "#{AUTOTEST_IMAGE_PATH}/fail#{cnt}.png"
+      growl "Test Results", "#{output}", "#{AUTOTEST_IMAGE_PATH}/ruby_red.png"
     elsif pending.to_i > 0
-      growl "Test Results", "#{output}", "#{AUTOTEST_IMAGE_PATH}/pass.png"
+      growl "Test Results", "#{output}", "#{AUTOTEST_IMAGE_PATH}/ruby_yellow.png"
     else
-      growl "Test Results", "#{output}", "#{AUTOTEST_IMAGE_PATH}/pass.png"
+      growl "Test Results", "#{output}", "#{AUTOTEST_IMAGE_PATH}/ruby_green.png"
     end
   end
 end

all/screenrc

@@ -2,7 +2,7 @@ defutf8 on
 defflow off
 vbell off
 startup_message off
-caption always "%{= kw}%-w%{=b KW}%n %t%{-}%+w %-= %{=b B}$LOGNAME@%H%{-} %D %d %M%C%a %{K}|%{b G} %l"
+caption always "%{= kw}%-w%{=b KW}%n %t%{-}%+w %-= %{=b C}$LOGNAME@%H%{-} %{K}| %d %M%C%a %{b G}"
 escape ``
 
 defscrollback 1000

all/vim/compiler/cucumber.vim

@@ -0,0 +1 @@
+../../../submodules/vim-cucumber/compiler/cucumber.vim

all/vim/ftdetect/cucumber.vim

@@ -0,0 +1 @@
+../../../submodules/vim-cucumber/ftdetect/cucumber.vim

all/vim/ftdetect/haml.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/ftdetect/haml.vim

all/vim/ftplugin/cucumber.vim

@@ -0,0 +1 @@
+../../../submodules/vim-cucumber/ftplugin/cucumber.vim

all/vim/ftplugin/haml.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/ftplugin/haml.vim

all/vim/ftplugin/sass.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/ftplugin/sass.vim

all/vim/ftplugin/scss.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/ftplugin/scss.vim

all/vim/indent/cucumber.vim

@@ -0,0 +1 @@
+../../../submodules/vim-cucumber/indent/cucumber.vim

all/vim/indent/haml.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/indent/haml.vim

all/vim/indent/sass.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/indent/sass.vim

all/vim/indent/scss.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/indent/scss.vim

all/vim/syntax/cucumber.vim

@@ -0,0 +1 @@
+../../../submodules/vim-cucumber/syntax/cucumber.vim

all/vim/syntax/haml.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/syntax/haml.vim

all/vim/syntax/sass.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/syntax/sass.vim

all/vim/syntax/scss.vim

@@ -0,0 +1 @@
+../../submodules/vim-haml/syntax/scss.vim