Rakefile in merb-gen-1.1.0.pre

- old
+ new

@@ -1,5 +1,14 @@
-require 'rubygems'
+begin
+  # Just in case the bundle was locked
+  # This shouldn't happen in a dev environment but lets be safe
+  require '.bundle/environment'
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+end
+
 require 'rake/rdoctask'
 
 require 'merb-core'
 require 'merb-core/tasks/merb'
 