Rakefile in nanoc-2.1.5 vs Rakefile in nanoc-2.1.6

@@ -3,19 +3,12 @@
 # Rake etc
 require 'rake'
 require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/testtask'
+require 'rake/rdoctask'
 
-# Rdoc
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  warn "Tried loading hanna but failed; falling back to the normal RDoc template"
-  require 'rake/rdoctask'
-end
-
 # nanoc itself
 require File.dirname(__FILE__) + '/lib/nanoc.rb'
 
 ##### Test Ruby 1.9
 
@@ -88,10 +81,12 @@
                               '--charset' << 'utf-8'                    <<
                               '--exclude' << 'lib/nanoc/cli/commands'   <<
                               '--exclude' << 'lib/nanoc/binary_filters' <<
                               '--exclude' << 'lib/nanoc/extra/vcses'    <<
                               '--exclude' << 'lib/nanoc/filters'        <<
+                              '--exclude' << 'doc'                      <<
                               '--exclude' << 'test'                     <<
+                              '--exclude' << 'vendor'                   <<
                               '--line-numbers'
 
   s.files                 = %w( README LICENSE ChangeLog Rakefile ) + Dir[File.join('{bin,lib}', '**', '*')]
   s.executables           = [ 'nanoc' ]
   s.require_path          = 'lib'