diff --git a/lib/juwelier/generator.rb b/lib/juwelier/generator.rb
index 6b6a33cb..edb358db 100644
--- a/lib/juwelier/generator.rb
+++ b/lib/juwelier/generator.rb
@@ -113,7 +113,7 @@ def initialize(options = {})
 
       development_dependencies << ["cucumber", ">= 0"] if should_use_cucumber
 
-      development_dependencies << ["bundler", "~> 1.0"]
+      development_dependencies << ["bundler", ">= 1.0"]
       development_dependencies << ["juwelier", "~> #{Juwelier::Version::STRING}"]
       development_dependencies << ["simplecov", ">= 0"]
       
@@ -154,7 +154,7 @@ def run
     end
 
     def constant_name
-      self.project_name.camel
+      self.project_name.snake.camel
     end
 
     def extension_name
@@ -208,7 +208,10 @@ def create_files
 
       output_template_in_target '.gitignore'
       output_template_in_target 'Rakefile'
-      output_template_in_target 'Gemfile' if should_use_bundler
+      if should_use_bundler
+        output_template_in_target 'Gemfile'
+        system 'bundle install'
+      end
       output_template_in_target 'LICENSE.txt'
       output_template_in_target "README.#{use_readme_format}"
       output_template_in_target '.document'
diff --git a/lib/juwelier/generator/options.rb b/lib/juwelier/generator/options.rb
index 7d3b37a9..967f8b4c 100644
--- a/lib/juwelier/generator/options.rb
+++ b/lib/juwelier/generator/options.rb
@@ -154,7 +154,7 @@ def initialize(args)
           end
           
           o.on('--markdown', 'use Markdown for the readme') do
-            self[:readme_format] = :markdown
+            self[:readme_format] = :md
           end
 
           o.on('-v', '--version', 'show version') do
diff --git a/lib/juwelier/templates/README.markdown b/lib/juwelier/templates/README.md
similarity index 85%
rename from lib/juwelier/templates/README.markdown
rename to lib/juwelier/templates/README.md
index c4f665dd..3ecf0443 100644
--- a/lib/juwelier/templates/README.markdown
+++ b/lib/juwelier/templates/README.md
@@ -1,10 +1,8 @@
-<%= project_name %>
-===================
+# <%= project_name %>
 
 Description goes here.
 
-Contributing to <%= project_name %>
-------------------------------------------
+## Contributing to <%= project_name %>
 
 -   Check out the latest master to make sure the feature hasn't been
     implemented or the bug hasn't been fixed yet.
@@ -20,8 +18,7 @@ Contributing to <%= project_name %>
     is fine, but please isolate to its own commit so I can cherry-pick
     around it.
 
-Copyright
----------
+## Copyright
 
 Copyright (c) <%= Time.now.year %> <%= user_name %>. See
 LICENSE.txt for further details.
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 10c6501f..9df88510 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -18,7 +18,7 @@
 require 'rake'
 require 'shoulda'
 #require 'redgreen'
-require 'construct'
+require 'test_construct'
 require 'git'
 require 'time'
 
@@ -39,7 +39,7 @@ def initialize
 end
 
 class Test::Unit::TestCase
-  include Construct::Helpers
+  include TestConstruct::Helpers
 
   def tmp_dir
     TMP_DIR