diff --git a/History.markdown b/History.markdown
index 23f81a0e..9bcf00f8 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Move to Rouge as default highlighter (#3323)
   * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
   * Always include file extension on output files (#3490)
+  * Improved permalinks for pages and collections (#3538)
 
 ### Minor Enhancements
 
@@ -46,6 +47,9 @@
   * Docs: document 'ordinal' built-in permalink style (#3532)
   * Upgrade liquid-c to 3.x (#3531)
   * Use consistent syntax for deprecation warning (#3535)
+  * Added build --destination and --source flags (#3418)
+  * Site template: remove unused `page.meta` attribute (#3537)
+  * Improve the error message when sorting null objects (#3520)
 
 ### Bug Fixes
 
@@ -89,6 +93,9 @@
   * Remove trailing whitespace (#3497)
   * Use `fixture_site` for Document tests (#3511)
   * Remove adapters deprecation warning (#3529)
+  * Minor fixes to `url.rb` to follow GitHub style guide (#3544)
+  * Minor changes to resolve deprecation warnings (#3547)
+  * Convert remaining textile test documents to markdown (#3528)
 
 ### Site Enhancements
 
@@ -129,6 +136,7 @@
   * Add jekyll-auto-image generator to the list of third-party plugins (#3489)
   * Replace link to the proposed `picture` element spec (#3530)
   * Add frontmatter date formatting information (#3469)
+  * Improve consistency and clarity of plugins options note (#3546)
 
 ## 2.5.3 / 2014-12-22
 
@@ -293,7 +301,6 @@
   * Allow Travis to 'parallelize' our tests (#2859)
   * Fix test for Liquid rendering in Sass (#2856)
   * Fixing "vertycal" typo in site template's `_base.scss` (#2889)
-  * Convert remaining textile test documents to markdown (#3528)
 
 ### Site Enhancements
 
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index f524c29f..dc6ba753 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -49,9 +49,13 @@ module Jekyll
   autoload :Filters,             'jekyll/filters'
   autoload :FrontmatterDefaults, 'jekyll/frontmatter_defaults'
   autoload :Layout,              'jekyll/layout'
-  autoload :LayoutReader,        'jekyll/readers/layout_reader'
-  autoload :DraftReader,        'jekyll/readers/draft_reader'
-  autoload :PostReader,        'jekyll/readers/post_reader'
+  autoload :CollectionReader,        'jekyll/readers/dynamic/collection_reader'
+  autoload :DataReader,        'jekyll/readers/dynamic/data_reader'
+  autoload :LayoutReader,        'jekyll/readers/dynamic/layout_reader'
+  autoload :DraftReader,        'jekyll/readers/dynamic/draft_reader'
+  autoload :PostReader,        'jekyll/readers/dynamic/post_reader'
+  autoload :PageReader, 'jekyll/readers/dynamic/page_reader'
+  autoload :StaticFileReader,        'jekyll/readers/static/static_file_reader'
   autoload :LogAdapter,          'jekyll/log_adapter'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
diff --git a/lib/jekyll/collection.rb b/lib/jekyll/collection.rb
index b09a7ed9..e8740cf6 100644
--- a/lib/jekyll/collection.rb
+++ b/lib/jekyll/collection.rb
@@ -170,7 +170,9 @@ module Jekyll
     #
     # Returns the URL template to render collection's documents at.
     def url_template
-      metadata.fetch('permalink', "/:collection/:path:output_ext")
+      metadata.fetch('permalink') do
+          Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
+      end
     end
 
     # Extract options for this collection from the site configuration.
diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index 12fd66e6..a72640fb 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -49,6 +49,8 @@ module Jekyll
       # Returns nothing
       def add_build_options(c)
         c.option 'config',  '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+        c.option 'destination', '-d', '--destination DESTINATION', 'The current folder will be generated into DESTINATION'
+        c.option 'source', '-s', '--source SOURCE', 'Custom source directory'
         c.option 'future',  '--future', 'Publishes posts with a future date'
         c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
         c.option 'watch',   '-w', '--[no-]watch', 'Watch for changes and rebuild'
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index e4855a9d..ca5d4839 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -137,7 +137,7 @@ module Jekyll
       config_files = override.delete('config')
       if config_files.to_s.empty?
         default = %w[yml yaml].find(Proc.new { 'yml' }) do |ext|
-          File.exists? Jekyll.sanitized_path(source(override), "_config.#{ext}")
+          File.exist?(Jekyll.sanitized_path(source(override), "_config.#{ext}"))
         end
         config_files = Jekyll.sanitized_path(source(override), "_config.#{default}")
         @default_config_file = true
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index d9c84fe8..12d4eb5a 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -222,6 +222,9 @@ module Jekyll
     #
     # Returns the filtered array of objects
     def sort(input, property = nil, nils = "first")
+      if input.nil?
+          raise ArgumentError.new("Cannot sort a null object.")
+      end
       if property.nil?
         input.sort
       else
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
index ca824245..a4ddb698 100644
--- a/lib/jekyll/page.rb
+++ b/lib/jekyll/page.rb
@@ -63,16 +63,12 @@ module Jekyll
     #
     # Returns the template String.
     def template
-      if site.permalink_style == :pretty
-        if index? && html?
-          "/:path/"
-        elsif html?
-          "/:path/:basename/"
-        else
-          "/:path/:basename:output_ext"
-        end
-      else
+      if !html?
         "/:path/:basename:output_ext"
+      elsif index?
+        "/:path/"
+      else
+        Utils.add_permalink_suffix("/:path/:basename", site.permalink_style)
       end
     end
 
diff --git a/lib/jekyll/reader.rb b/lib/jekyll/reader.rb
index 5e44f279..51ba2ed5 100644
--- a/lib/jekyll/reader.rb
+++ b/lib/jekyll/reader.rb
@@ -13,10 +13,76 @@ module Jekyll
     #
     # Returns nothing.
     def read
-      site.layouts = LayoutReader.new(site).read
+      @site.layouts = LayoutReader.new(site).read
       read_directories
-      read_data(site.config['data_source'])
-      read_collections
+      @site.data = DataReader.new(site).read(site.config['data_source'])
+      CollectionReader.new(site).read
+    end
+
+    # Recursively traverse directories to find posts, pages and static files
+    # that will become part of the site according to the rules in
+    # filter_entries.
+    #
+    # dir - The String relative path of the directory to read. Default: ''.
+    #
+    # Returns nothing.
+    def read_directories(dir = '')
+      retrieve_posts(dir)
+
+      # Obtain sub-directories in order to recursively read them.
+      base = site.in_source_dir(dir)
+      dot = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
+      dot_dirs = dot.select{ |file| File.directory?(@site.in_source_dir(base,file)) }
+      retrieve_dirs(base, dir, dot_dirs)
+
+      dot_files = (dot - dot_dirs)
+
+      # Obtain all the pages.
+      dot_pages = dot_files.select{ |file| Utils.has_yaml_header?(@site.in_source_dir(base,file)) }
+      retrieve_pages(dir, dot_pages)
+
+      # Assume the remaining files to be static files.
+      dot_static_files = dot_files - dot_pages
+      retrieve_static_files(dir, dot_static_files)
+    end
+
+    # Retrieves all the posts(posts/drafts) from the given directory
+    # and add them to the site and sort them.
+    #
+    # Returns nothing.
+    def retrieve_posts(dir)
+      site.posts += PostReader.new(site).read(dir)
+      site.posts += DraftReader.new(site).read(dir) if site.show_drafts
+      site.posts.sort!
+    end
+
+    # Recursively traverse directories with the read_directories function.
+    #
+    # Returns nothing.
+    def retrieve_dirs(base, dir, dot_dirs)
+      dot_dirs.map { |file|
+        dir_path = site.in_source_dir(dir,file)
+        rel_path = File.join(dir, file)
+        @site.reader.read_directories(rel_path) unless @site.dest.sub(/\/$/, '') == dir_path
+      }
+    end
+
+    # Retrieve all the pages from the current directory,
+    # add them to the site and sort them.
+    #
+    # Returns nothing.
+    def retrieve_pages(dir, dot_pages)
+      site.pages += PageReader.new(site, dir).read(dot_pages)
+      site.pages.sort_by!(&:name)
+    end
+
+    # Retrieve all the static files from the current directory,
+    # add them to the site and sort them.
+    #
+    # Returns nothing.
+    def retrieve_static_files(dir, dot_static_files)
+      site.static_files += StaticFileReader.new(site, dir).read(dot_static_files)
+      site.static_files.sort_by!(&:relative_path)
     end
 
     # Filter out any files/directories that are hidden or backup files (start
@@ -43,144 +109,5 @@ module Jekyll
       entries = Dir.chdir(base) { filter_entries(Dir['**/*'], base) }
       entries.delete_if { |e| File.directory?(site.in_source_dir(base, e)) }
     end
-
-
-    # Determines how to read a data file.
-    #
-    # Returns the contents of the data file.
-    def read_data_file(path)
-      case File.extname(path).downcase
-        when '.csv'
-          CSV.read(path, {
-                           :headers => true,
-                           :encoding => site.config['encoding']
-                       }).map(&:to_hash)
-        else
-          SafeYAML.load_file(path)
-      end
-    end
-
-    # Recursively traverse directories to find posts, pages and static files
-    # that will become part of the site according to the rules in
-    # filter_entries.
-    #
-    # dir - The String relative path of the directory to read. Default: ''.
-    #
-    # Returns nothing.
-    def read_directories(dir = '')
-      base = site.in_source_dir(dir)
-      entries = Dir.chdir(base) { filter_entries(Dir.entries('.'), base) }
-
-      site.posts += PostReader.new(site).read(dir)
-
-      if site.show_drafts
-        site.posts += DraftReader.new(site).read(dir)
-      end
-
-      site.posts.sort!
-      limit_posts if site.limit_posts > 0 # limit the posts if :limit_posts option is set
-
-      entries.each do |f|
-        f_abs = site.in_source_dir(base, f)
-        if File.directory?(f_abs)
-          f_rel = File.join(dir, f)
-          read_directories(f_rel) unless site.dest.sub(/\/$/, '') == f_abs
-        elsif Utils.has_yaml_header?(f_abs)
-          page = Page.new(site, site.source, dir, f)
-          site.pages << page if site.publisher.publish?(page)
-        else
-          site.static_files << StaticFile.new(site, site.source, dir, f)
-        end
-      end
-      site.pages.sort_by!(&:name)
-      site.static_files.sort_by!(&:relative_path)
-    end
-
-    # Read all the content files from <source>/<dir>/magic_dir
-    #   and return them with the type klass.
-    #
-    # dir - The String relative path of the directory to read.
-    # magic_dir - The String relative directory to <dir>,
-    #   looks for content here.
-    # klass - The return type of the content.
-    #
-    # Returns klass type of content files
-    def read_content(dir, magic_dir, klass)
-      get_entries(dir, magic_dir).map do |entry|
-        klass.new(site, site.source, dir, entry) if klass.valid?(entry)
-      end.reject do |entry|
-        entry.nil?
-      end
-    end
-
-    # Read and parse all yaml files under <source>/<dir>
-    #
-    # Returns nothing
-    def read_data(dir)
-      base = site.in_source_dir(dir)
-      read_data_to(base, site.data)
-    end
-
-    # Read and parse all yaml files under <dir> and add them to the
-    # <data> variable.
-    #
-    # dir - The string absolute path of the directory to read.
-    # data - The variable to which data will be added.
-    #
-    # Returns nothing
-    def read_data_to(dir, data)
-      return unless File.directory?(dir) && (!site.safe || !File.symlink?(dir))
-
-      entries = Dir.chdir(dir) do
-        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
-      end
-
-      entries.each do |entry|
-        path = site.in_source_dir(dir, entry)
-        next if File.symlink?(path) && site.safe
-
-        key = sanitize_filename(File.basename(entry, '.*'))
-        if File.directory?(path)
-          read_data_to(path, data[key] = {})
-        else
-          data[key] = read_data_file(path)
-        end
-      end
-    end
-
-    # Read in all collections specified in the configuration
-    #
-    # Returns nothing.
-    def read_collections
-      site.collections.each do |_, collection|
-        collection.read unless collection.label.eql?('data')
-      end
-    end
-
-    def sanitize_filename(name)
-      name.gsub!(/[^\w\s_-]+/, '')
-      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
-      name.gsub(/\s+/, '_')
-    end
-
-    # Aggregate post information
-    #
-    # post - The Post object to aggregate information for
-    #
-    # Returns nothing
-    def aggregate_post_info(post)
-      site.posts << post
-    end
-
-    private
-
-    # Limits the current posts; removes the posts which exceed the limit_posts
-    #
-    # Returns nothing
-    def limit_posts
-      limit = site.posts.length < site.limit_posts ? site.posts.length : site.limit_posts
-      site.posts = site.posts[-limit, limit]
-    end
-
   end
 end
\ No newline at end of file
diff --git a/lib/jekyll/readers/draft_reader.rb b/lib/jekyll/readers/draft_reader.rb
deleted file mode 100644
index ac6ea964..00000000
--- a/lib/jekyll/readers/draft_reader.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Jekyll
-  class DraftReader
-    attr_reader :site, :unfiltered_content
-    def initialize(site)
-      @site = site
-      @unfiltered_content = Array.new
-    end
-
-    # Read all the files in <source>/<dir>/_drafts and create a new Draft
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read(dir)
-      @unfiltered_content = @site.reader.read_content(dir, '_drafts', Draft)
-      @unfiltered_content.select{ |draft| site.publisher.publish?(draft) }
-    end
-  end
-end
diff --git a/lib/jekyll/readers/dynamic/collection_reader.rb b/lib/jekyll/readers/dynamic/collection_reader.rb
new file mode 100644
index 00000000..04324fa1
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/collection_reader.rb
@@ -0,0 +1,19 @@
+module Jekyll
+  class CollectionReader
+    attr_reader :site, :content
+    def initialize(site)
+      @site = site
+      @content = {}
+    end
+
+    # Read in all collections specified in the configuration
+    #
+    # Returns nothing.
+    def read
+      site.collections.each do |_, collection|
+        collection.read unless collection.label.eql?('data')
+      end
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/lib/jekyll/readers/dynamic/data_reader.rb b/lib/jekyll/readers/dynamic/data_reader.rb
new file mode 100644
index 00000000..e436bff4
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/data_reader.rb
@@ -0,0 +1,69 @@
+module Jekyll
+  class DataReader
+    attr_reader :site, :content
+    def initialize(site)
+      @site = site
+      @content = {}
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new Draft
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      base = site.in_source_dir(dir)
+      read_data_to(base, @content)
+      @content
+    end
+
+    # Read and parse all yaml files under <dir> and add them to the
+    # <data> variable.
+    #
+    # dir - The string absolute path of the directory to read.
+    # data - The variable to which data will be added.
+    #
+    # Returns nothing
+    def read_data_to(dir, data)
+      return unless File.directory?(dir) && (!site.safe || !File.symlink?(dir))
+
+      entries = Dir.chdir(dir) do
+        Dir['*.{yaml,yml,json,csv}'] + Dir['*'].select { |fn| File.directory?(fn) }
+      end
+
+      entries.each do |entry|
+        path = @site.in_source_dir(dir, entry)
+        next if File.symlink?(path) && site.safe
+
+        key = sanitize_filename(File.basename(entry, '.*'))
+        if File.directory?(path)
+          read_data_to(path, data[key] = {})
+        else
+          data[key] = read_data_file(path)
+        end
+      end
+    end
+
+    # Determines how to read a data file.
+    #
+    # Returns the contents of the data file.
+    def read_data_file(path)
+      case File.extname(path).downcase
+        when '.csv'
+          CSV.read(path, {
+                           :headers => true,
+                           :encoding => site.config['encoding']
+                       }).map(&:to_hash)
+        else
+          SafeYAML.load_file(path)
+      end
+    end
+
+    def sanitize_filename(name)
+      name.gsub!(/[^\w\s_-]+/, '')
+      name.gsub!(/(^|\b\s)\s+($|\s?\b)/, '\\1\\2')
+      name.gsub(/\s+/, '_')
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/jekyll/readers/dynamic/draft_reader.rb b/lib/jekyll/readers/dynamic/draft_reader.rb
new file mode 100644
index 00000000..d62029b2
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/draft_reader.rb
@@ -0,0 +1,37 @@
+module Jekyll
+  class DraftReader
+    attr_reader :site, :unfiltered_content
+    def initialize(site)
+      @site = site
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/_drafts and create a new Draft
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      @unfiltered_content = read_content(dir, '_drafts')
+      @unfiltered_content.select{ |draft| site.publisher.publish?(draft) }
+    end
+
+    # Read all the content files from <source>/<dir>/magic_dir
+    #   and return them with the type klass.
+    #
+    # dir - The String relative path of the directory to read.
+    # magic_dir - The String relative directory to <dir>,
+    #   looks for content here.
+    # klass - The return type of the content.
+    #
+    # Returns klass type of content files
+    def read_content(dir, magic_dir)
+      @site.reader.get_entries(dir, magic_dir).map do |entry|
+        Draft.new(site, site.source, dir, entry) if Draft.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/readers/layout_reader.rb b/lib/jekyll/readers/dynamic/layout_reader.rb
similarity index 100%
rename from lib/jekyll/readers/layout_reader.rb
rename to lib/jekyll/readers/dynamic/layout_reader.rb
diff --git a/lib/jekyll/readers/dynamic/page_reader.rb b/lib/jekyll/readers/dynamic/page_reader.rb
new file mode 100644
index 00000000..099ebf13
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/page_reader.rb
@@ -0,0 +1,21 @@
+module Jekyll
+  class PageReader
+    attr_reader :site, :dir, :unfiltered_content
+    def initialize(site, dir)
+      @site = site
+      @dir = dir
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/ for Yaml header and create a new Page
+    # object for each file.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns an array of static pages.
+    def read(files)
+      files.map{ |page| @unfiltered_content << Page.new(@site, @site.source, @dir, page) }
+      @unfiltered_content.select{ |page| site.publisher.publish?(page) }
+    end
+  end
+end
diff --git a/lib/jekyll/readers/dynamic/post_reader.rb b/lib/jekyll/readers/dynamic/post_reader.rb
new file mode 100644
index 00000000..73bdd85d
--- /dev/null
+++ b/lib/jekyll/readers/dynamic/post_reader.rb
@@ -0,0 +1,37 @@
+module Jekyll
+  class PostReader
+    attr_reader :site, :unfiltered_content
+    def initialize(site)
+      @site = site
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/_posts and create a new Post
+    # object with each one.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns nothing.
+    def read(dir)
+      @unfiltered_content = read_content(dir, '_posts')
+      @unfiltered_content.select{ |post| site.publisher.publish?(post) }
+    end
+
+    # Read all the content files from <source>/<dir>/magic_dir
+    #   and return them with the type klass.
+    #
+    # dir - The String relative path of the directory to read.
+    # magic_dir - The String relative directory to <dir>,
+    #   looks for content here.
+    # klass - The return type of the content.
+    #
+    # Returns klass type of content files
+    def read_content(dir, magic_dir)
+      @site.reader.get_entries(dir, magic_dir).map do |entry|
+        Post.new(site, site.source, dir, entry) if Post.valid?(entry)
+      end.reject do |entry|
+        entry.nil?
+      end
+    end
+  end
+end
diff --git a/lib/jekyll/readers/post_reader.rb b/lib/jekyll/readers/post_reader.rb
deleted file mode 100644
index 471f1414..00000000
--- a/lib/jekyll/readers/post_reader.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Jekyll
-  class PostReader
-    attr_reader :site, :unfiltered_content
-    def initialize(site)
-      @site = site
-      @unfiltered_content = Array.new
-    end
-
-    # Read all the files in <source>/<dir>/_posts and create a new Post
-    # object with each one.
-    #
-    # dir - The String relative path of the directory to read.
-    #
-    # Returns nothing.
-    def read(dir)
-      @unfiltered_content = @site.reader.read_content(dir, '_posts', Post)
-      @unfiltered_content.select{ |post| site.publisher.publish?(post) }
-    end
-  end
-end
diff --git a/lib/jekyll/readers/static/static_file_reader.rb b/lib/jekyll/readers/static/static_file_reader.rb
new file mode 100644
index 00000000..279bea46
--- /dev/null
+++ b/lib/jekyll/readers/static/static_file_reader.rb
@@ -0,0 +1,21 @@
+module Jekyll
+  class StaticFileReader
+    attr_reader :site, :dir, :unfiltered_content
+    def initialize(site, dir)
+      @site = site
+      @dir = dir
+      @unfiltered_content = Array.new
+    end
+
+    # Read all the files in <source>/<dir>/ for Yaml header and create a new Page
+    # object for each file.
+    #
+    # dir - The String relative path of the directory to read.
+    #
+    # Returns an array of static files.
+    def read(files)
+      files.map{ |file| @unfiltered_content << StaticFile.new(@site, @site.source, @dir, file)}
+      @unfiltered_content
+    end
+  end
+end
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index af54f088..30564044 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -130,6 +130,7 @@ module Jekyll
     # Returns nothing.
     def read
       reader.read
+      limit_posts!
     end
 
     # Run each of the Generators.
@@ -383,5 +384,15 @@ module Jekyll
     def site_cleaner
       @site_cleaner ||= Cleaner.new(self)
     end
+
+    # Limits the current posts; removes the posts which exceed the limit_posts
+    #
+    # Returns nothing
+    def limit_posts!
+      if limit_posts > 0
+        limit = posts.length < limit_posts ? posts.length : limit_posts
+        self.posts = posts[-limit, limit]
+      end
+    end
   end
 end
diff --git a/lib/jekyll/url.rb b/lib/jekyll/url.rb
index 60c96507..14b70631 100644
--- a/lib/jekyll/url.rb
+++ b/lib/jekyll/url.rb
@@ -44,12 +44,12 @@ module Jekyll
     #
     # Returns the _unsanitized String URL
     def generated_permalink
-      (@generated_permlink ||= generate_url(@permalink)) if @permalink
+      (@generated_permalink ||= generate_url(@permalink)) if @permalink
     end
 
     # Generates a URL from the template
     #
-    # Returns the _unsanitized String URL
+    # Returns the unsanitized String URL
     def generated_url
       @generated_url ||= generate_url(@template)
     end
@@ -57,7 +57,7 @@ module Jekyll
     # Internal: Generate the URL by replacing all placeholders with their
     # respective values in the given template
     #
-    # Returns the _unsanitizied_ String URL
+    # Returns the unsanitized String URL
     def generate_url(template)
       @placeholders.inject(template) do |result, token|
         break result if result.index(':').nil?
@@ -81,7 +81,7 @@ module Jekyll
         .gsub(/\A([^\/])/, '/\1')
 
       # Append a trailing slash to the URL if the unsanitized URL had one
-      url << "/" if in_url[-1].eql?('/')
+      url << "/" if in_url.end_with?("/")
 
       url
     end
@@ -107,7 +107,7 @@ module Jekyll
       #   pct-encoded   = "%" HEXDIG HEXDIG
       #   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
       #                 / "*" / "+" / "," / ";" / "="
-      URI.escape(path, /[^a-zA-Z\d\-._~!$&\'()*+,;=:@\/]/).encode('utf-8')
+      URI.escape(path, /[^a-zA-Z\d\-._~!$&'()*+,;=:@\/]/).encode('utf-8')
     end
 
     # Unescapes a URL path segment
diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
index bba8b148..39302790 100644
--- a/lib/jekyll/utils.rb
+++ b/lib/jekyll/utils.rb
@@ -158,5 +158,45 @@ module Jekyll
         downcase
     end
 
+    # Add an appropriate suffix to template so that it matches the specified
+    # permalink style.
+    #
+    # template - permalink template without trailing slash or file extension
+    # permalink_style - permalink style, either built-in or custom
+    #
+    # The returned permalink template will use the same ending style as
+    # specified in permalink_style.  For example, if permalink_style contains a
+    # trailing slash (or is :pretty, which indirectly has a trailing slash),
+    # then so will the returned template.  If permalink_style has a trailing
+    # ":output_ext" (or is :none, :date, or :ordinal) then so will the returned
+    # template.  Otherwise, template will be returned without modification.
+    #
+    # Examples:
+    #   add_permalink_suffix("/:basename", :pretty)
+    #   # => "/:basename/"
+    #
+    #   add_permalink_suffix("/:basename", :date)
+    #   # => "/:basename:output_ext"
+    #
+    #   add_permalink_suffix("/:basename", "/:year/:month/:title/")
+    #   # => "/:basename/"
+    #
+    #   add_permalink_suffix("/:basename", "/:year/:month/:title")
+    #   # => "/:basename"
+    #
+    # Returns the updated permalink template
+    def add_permalink_suffix(template, permalink_style)
+      case permalink_style
+      when :pretty
+        template << "/"
+      when :date, :ordinal, :none
+        template << ":output_ext"
+      else
+        template << "/" if permalink_style.to_s.end_with?("/")
+        template << ":output_ext" if permalink_style.to_s.end_with?(":output_ext")
+      end
+      template
+    end
+
   end
 end
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 8b67d1cf..64cdaba2 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0-beta1'
+  VERSION = '3.0.0.beta2'
 end
diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html
index d4f8be3e..3a0fb52e 100644
--- a/lib/site_template/_layouts/post.html
+++ b/lib/site_template/_layouts/post.html
@@ -5,7 +5,7 @@ layout: default
 
   <header class="post-header">
     <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
-    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+    <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %-d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
   </header>
 
   <div class="post-content" itemprop="articleBody">
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 346dc131..98fb9bb8 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -191,6 +191,7 @@ permalink: "/docs/history/"
 - Allow Travis to 'parallelize' our tests ([#2859]({{ site.repository }}/issues/2859))
 - Fix test for Liquid rendering in Sass ([#2856]({{ site.repository }}/issues/2856))
 - Fixing "vertycal" typo in site template's `_base.scss` ([#2889]({{ site.repository }}/issues/2889))
+- Convert remaining textile test documents to markdown ([#3528]({{ site.repository }}/issues/3528))
 
 ### Site Enhancements
 {: #site-enhancements-v2-4-0}
diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md
index 9f4afb97..4958add3 100644
--- a/site/_docs/plugins.md
+++ b/site/_docs/plugins.md
@@ -42,12 +42,12 @@ You have 3 options for installing plugins:
 
 <div class="note info">
   <h5>
-    <code>_plugins</code> and <code>gems</code>
+    <code>_plugins</code>, <code>_config.yml</code> and <code>Gemfile</code>
     can be used simultaneously
   </h5>
   <p>
-    You may use both of the aforementioned plugin options simultaneously in the
-    same site if you so choose. Use of one does not restrict the use of the other
+    You may use any of the aforementioned plugin options simultaneously in the
+    same site if you so choose. Use of one does not restrict the use of the others.
   </p>
 </div>
 
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 7e14a418..8de8ac29 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -42,12 +42,12 @@ class TestConfiguration < JekyllUnitTest
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return .yaml if it exists but .yml does not" do
-      mock(File).exists?(source_dir("_config.yml")) { false }
-      mock(File).exists?(source_dir("_config.yaml")) { true }
+      mock(File).exist?(source_dir("_config.yml")) { false }
+      mock(File).exist?(source_dir("_config.yaml")) { true }
       assert_equal [source_dir("_config.yaml")], @config.config_files(@no_override)
     end
     should "return .yml if both .yml and .yaml exist" do
-      mock(File).exists?(source_dir("_config.yml")) { true }
+      mock(File).exist?(source_dir("_config.yml")) { true }
       assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return the config if given one config file" do
diff --git a/test/test_document.rb b/test/test_document.rb
index 56d6a671..f8b9db66 100644
--- a/test/test_document.rb
+++ b/test/test_document.rb
@@ -219,7 +219,31 @@ class TestDocument < JekyllUnitTest
       assert_equal "/slides/test/example-slide-1", @document.url
     end
 
-    should "produce the right destination" do
+    should "produce the right destination file" do
+      assert_equal @dest_file, @document.destination(dest_dir)
+    end
+  end
+
+  context "a document in a collection with pretty permalink style" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "slides" => {
+            "output"    => true,
+          }
+        },
+      })
+      @site.permalink_style = :pretty
+      @site.process
+      @document = @site.collections["slides"].docs[0]
+      @dest_file = dest_dir("slides/example-slide-1/index.html")
+    end
+
+    should "produce the right URL" do
+      assert_equal "/slides/example-slide-1/", @document.url
+    end
+
+    should "produce the right destination file" do
       assert_equal @dest_file, @document.destination(dest_dir)
     end
   end
diff --git a/test/test_filters.rb b/test/test_filters.rb
index eec08564..82d31922 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -280,6 +280,12 @@ class TestFilters < JekyllUnitTest
     end
 
     context "sort filter" do
+      should "raise Exception when input is nil" do
+        err = assert_raises ArgumentError do
+          @filter.sort(nil)
+        end
+        assert_equal "Cannot sort a null object.", err.message
+      end
       should "return sorted numbers" do
         assert_equal [1, 2, 2.2, 3], @filter.sort([3, 2.2, 2, 1])
       end
diff --git a/test/test_page.rb b/test/test_page.rb
index 9918442f..1e4d3da6 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -46,7 +46,7 @@ class TestPage < JekyllUnitTest
 
         should "create index url based on filename" do
           @page = setup_page('/contacts', 'index.html')
-          assert_equal "/contacts/index.html", @page.url
+          assert_equal "/contacts/", @page.url
         end
       end
 
@@ -129,6 +129,58 @@ class TestPage < JekyllUnitTest
         end
       end
 
+      context "with date permalink style" do
+        setup do
+          @site.permalink_style = :date
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts.html', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with trailing slash" do
+        setup do
+          @site.permalink_style = "/:title/"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts/index.html")
+          assert_equal '/contacts/', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with file extension" do
+        setup do
+          @site.permalink_style = "/:title:output_ext"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts.html', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
+      context "with custom permalink style with no extension" do
+        setup do
+          @site.permalink_style = "/:title"
+        end
+
+        should "return url and destination correctly" do
+          @page = setup_page('contacts.html')
+          @dest_file = dest_dir("contacts.html")
+          assert_equal '/contacts', @page.url
+          assert_equal @dest_file, @page.destination(dest_dir)
+        end
+      end
+
       context "with any other permalink style" do
         should "return dir correctly" do
           @site.permalink_style = nil
diff --git a/test/test_site.rb b/test/test_site.rb
index e77a5ad1..ce9cbc95 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -143,7 +143,7 @@ class TestSite < JekyllUnitTest
 
       # simulate destination file deletion
       File.unlink dest
-      refute File.exists?(dest)
+      refute File.exist?(dest)
 
       sleep 1
       @site.process
@@ -369,7 +369,7 @@ class TestSite < JekyllUnitTest
         site = Site.new(site_configuration)
         site.process
 
-        file_content = site.reader.read_data_file(source_dir('_data', 'members.yaml'))
+        file_content = DataReader.new(site).read_data_file(source_dir('_data', 'members.yaml'))
 
         assert_equal site.data['members'], file_content
         assert_equal site.site_payload['site']['data']['members'], file_content
diff --git a/test/test_utils.rb b/test/test_utils.rb
index ddb63d4b..9d4a5a4d 100644
--- a/test/test_utils.rb
+++ b/test/test_utils.rb
@@ -166,4 +166,18 @@ class TestUtils < JekyllUnitTest
     end
   end
 
+  context "The \`Utils.add_permalink_suffix\` method" do
+    should "handle built-in permalink styles" do
+      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", :pretty)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :date)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :ordinal)
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", :none)
+    end
+
+    should "handle custom permalink styles" do
+      assert_equal "/:basename/", Utils.add_permalink_suffix("/:basename", "/:title/")
+      assert_equal "/:basename:output_ext", Utils.add_permalink_suffix("/:basename", "/:title:output_ext")
+      assert_equal "/:basename", Utils.add_permalink_suffix("/:basename", "/:title")
+    end
+  end
 end