Merge branch 'ruby19'

Conflicts:
	test/test_helper.rb

Rakefile

@@ -8,7 +8,7 @@ begin
     s.email             = "francois@teksol.info"
     s.homepage          = "http://francois.github.com/piston"
     s.description       = "Piston makes it easy to merge vendor branches into your own repository, without worrying about which revisions were grabbed or not.  Piston will also keep your local changes in addition to the remote changes."
-    s.authors           = "François Beausoleil"
+    s.authors           = "Francois Beausoleil"
     s.has_rdoc          = false
     s.rubyforge_project = "piston"
 
@@ -21,3 +21,5 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
+
+task :default => :test

lib/piston.rb

@@ -6,13 +6,14 @@
 
 require "piston/git"
 require "piston/svn"
+require "piston/commands"
 
 require "pathname"
 
 module Piston
   class << self
     def version_message
-      "Piston %s\nCopyright 2006-2008, François Beausoleil <francois@teksol.info>\nhttp://piston.rubyforge.org/\nDistributed under an MIT-like license." % Piston::VERSION::STRING
+      "Piston %s\nCopyright 2006-2008, Francois Beausoleil <francois@teksol.info>\nhttp://piston.rubyforge.org/\nDistributed under an MIT-like license." % Piston::VERSION::STRING
     end
   end
 end