Merge remote-tracking branch 'origin/v3-stable'

Conflicts:
	CHANGELOG.md
	middleman-core/lib/middleman-core/core_extensions/rendering.rb
	middleman-core/lib/middleman-core/extensions.rb
	middleman-core/lib/middleman-core/version.rb
	middleman-core/lib/middleman-more/core_extensions/compass.rb
	middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
	middleman-core/middleman-core.gemspec

middleman-cli/lib/middleman-cli/build.rb

@@ -64,6 +64,8 @@ module Middleman::Cli
       opts[:glob]  = options['glob'] if options.has_key?('glob')
       opts[:clean] = options['clean']
 
+      self.class.shared_instance.run_hook :before_build, self
+
       action BuildAction.new(self, opts)
 
       self.class.shared_instance.run_hook :after_build, self

middleman-cli/lib/middleman-cli/console.rb

@@ -34,7 +34,7 @@ module Middleman::Cli
           config[:environment] = opts[:environment].to_sym
         end
 
-        logger(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
+        ::Middleman::Logger.singleton(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
       end
 
       # TODO: get file watcher / reload! working in console

middleman-cli/lib/middleman-cli/init.rb

@@ -43,7 +43,7 @@ module Middleman::Cli
       :desc    => 'Skip Git ignores and keeps'
     # The init task
     # @param [String] name
-    def init(name)
+    def init(name = '.')
       key = options[:template].to_sym
       unless ::Middleman::Templates.registered.has_key?(key)
         raise Thor::Error.new "Unknown project template '#{key}'"

middleman-cli/lib/middleman-cli/templates/shared/config.tt

@@ -24,7 +24,7 @@
 #   page "/admin/*"
 # end
 
-# Proxy pages (http://middlemanapp.com/dynamic-pages/)
+# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/)
 # proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
 #  :which_fake_page => "Rendering a fake page with a local variable" }