Pull Octopress (0ead88e6..c9e0078) into the code base.

Squashed commit of the following:

commit c9e0078d65957180db6614a370a75ba881775e40
Merge: 0f16604 2d40f51
Author: Brandon Mathis <brandon@imathis.com>
Date:   Tue Aug 12 13:11:09 2014 -0500

    Merge pull request #1629 from yous/patch-layout

    Set layout to null to suppress warning

commit 2d40f51bd2d0368ad89e6862e84681763669d709
Author: ChaYoung You <yousbe@gmail.com>
Date:   Wed Aug 13 02:44:23 2014 +0900

    Set layout to null to suppress warning

    Not applied in 0f1660437beba58cd2974f07270b19305b9bbfd9.

commit 0f1660437beba58cd2974f07270b19305b9bbfd9
Author: Brandon Mathis <brandon@imathis.com>
Date:   Tue Aug 12 12:02:20 2014 -0500

    Set layout to null to avoid page defaults.

commit bb06eec777f8837f968c7d836526145d1d44f158
Merge: 73e5404 3d0e857
Author: Brandon Mathis <brandon@imathis.com>
Date:   Tue Aug 12 12:01:16 2014 -0500

    Merge pull request #1628 from yous/patch-octopress-filter

    Use `octopress-hooks` and `octopress-date-format`

commit 3d0e85730d6c8eb7aa72a97149169dc0d2e92097
Author: ChaYoung You <yousbe@gmail.com>
Date:   Wed Aug 13 01:45:15 2014 +0900

    Use `octopress-hooks` and `octopress-date-format`

    Not applied in 73e540409ceb8bc18048b6a96a4b815fc303ea28.

    Fix #1622.

commit 73e540409ceb8bc18048b6a96a4b815fc303ea28
Author: Brandon Mathis <brandon@imathis.com>
Date:   Tue Aug 12 10:55:23 2014 -0500

    Support octopress-hooks and octopress-date-format #1622

commit 18784a4cb04ed658268a5a4ba9bdf399e0c898ff
Author: Parker Moore <email@byparker.com>
Date:   Tue Aug 12 11:55:16 2014 -0400

    Revert "remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'"

    This reverts commit 181d620c1c46c644c4319e81edc342ae5a30c067.

commit ce458d8b9e94c0b033cac3f05572b2fcb132c953
Merge: 6a099bf 181d620
Author: Parker Moore <email@byparker.com>
Date:   Sat Aug 9 22:51:38 2014 -0400

    Merge pull request #1622 from raysrashmi/ry-updating-gems

    remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'

commit 181d620c1c46c644c4319e81edc342ae5a30c067
Author: Rashmi Yadav <rays.rashmi@gmail.com>
Date:   Thu Aug 7 16:03:13 2014 +0200

    remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'

commit 6a099bfdb9a193a4c1a8d16cf99f0674f8a2db82
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Thu Jul 31 16:22:30 2014 -0400

    Delete Gemfile.lock

    Follow-up to #1617

commit f4d17ca45d17eaaaa9b5ee9ccb600d929b86289d
Merge: c977b91 ed0412b
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Thu Jul 31 16:21:49 2014 -0400

    Merge pull request #1617 from nickhammond/patch-1

    .gitignore Gemfile.lock per previous commit

commit ed0412bef8867ec52758bb9fc93e37218e1ffcc1
Author: Nick Hammond <nick@nickhammond.com>
Date:   Thu Jul 24 18:08:14 2014 -0500

    .gitignore Gemfile.lock per previous commit

    Gemfile.lock was removed in a previous commit, should be ignored so it doesn't get committed again.

    https://github.com/imathis/octopress/commit/06c04397053e46fe02fcecce589a2de76d21e160

commit c977b91e40b481b5f3c3f1d0bad5797c64571ccf
Merge: 4fdae37 00d1591
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Sat Jul 19 19:35:13 2014 -0400

    Merge pull request #1609 from alindeman/patch-1

    Fixes load path issues with ruby-based git credential helpers

commit 00d15913220b25ebe55c581d557069d6833cf44b
Author: Andy Lindeman <andy@lindeman.io>
Date:   Sat Jul 19 15:08:28 2014 -0400

    Fixes load path issues with ruby-based git credential helpers

    Otherwise, we get errors like this (with boxen, e.g.):

    ```
    /opt/boxen/bin/boxen-git-credential:23:in `require': cannot load such file -- boxen/config (LoadError)
            from /opt/boxen/bin/boxen-git-credential:23:in `<main>'
    Username for 'https://github.com':
    ```

commit 4fdae37e4294618084f652c99c0c06ba7663ac07
Merge: 9d0c54e 7e044b4
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Tue Jun 24 16:30:17 2014 -0400

    Merge pull request #1592 from yous/patch-4

    Update `paginate_path` comment based on default value

commit 7e044b498e52303611407790d622e2b6cb22b0c0
Author: ChaYoung You <yousbe@gmail.com>
Date:   Tue Jun 24 18:15:38 2014 +0900

    Update `paginate_path` comment based on default value

commit 9d0c54e3e67d7c179cd87034f18e57fd97be1e42
Author: Brandon Mathis <brandon@imathis.com>
Date:   Sat Jun 21 16:41:32 2014 -0500

    Removed date plugin, added excerpt separator default

commit a0229b2c9c1bb51bf6534bef528e6b2986c4064a
Author: Brandon Mathis <brandon@imathis.com>
Date:   Sat Jun 21 15:51:40 2014 -0500

    Replaced date plugin with jekyll-date-format

commit 72ea6042e33f0b92e4923c3af00e923f19472573
Merge: 695fe92 06c0439
Author: Brandon Mathis <brandon@imathis.com>
Date:   Sat Jun 21 13:55:43 2014 -0500

    Merge pull request #1589 from imathis/jekyll-2

    Jekyll 2.0 compatability

commit 06c04397053e46fe02fcecce589a2de76d21e160
Author: Brandon Mathis <brandon@imathis.com>
Date:   Sat Jun 21 13:49:29 2014 -0500

    No longer including Gemfile.lock. Turns out that was a bad idea.

commit 2f47c00b48407933da369979a88f57a27720b58b
Author: Brandon Mathis <brandon@imathis.com>
Date:   Sat Jun 21 13:46:27 2014 -0500

    Added jekyll-sitemap, jekyll-date-format, and updated gems

commit 52f911964577623b2091d306957397ef3b8ccf2d
Author: Brandon Mathis <brandon@imathis.com>
Date:   Sat Jun 21 10:34:55 2014 -0500

    Initial update to be compatible with Jekyll 2

commit 695fe922a9c25d3f41fddccf9d2e4ba2fc02ef52
Merge: 9bc4bb0 e95d15d
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Sun Jun 15 21:46:08 2014 -0400

    Merge pull request #1586 from simonewebdesign/master

    Refactoring addSidebarToggler()

commit e95d15d584da26bad32cf56da78dad97c9fd57eb
Author: Simone <hello@simonewebdesign.it>
Date:   Sun Jun 15 21:51:15 2014 +0100

    Refactoring addSidebarToggler()

commit 9bc4bb02ee3318d07b6b1ecd838a09461eff627b
Merge: ff1b10d 24fdbbb
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Fri May 23 17:51:12 2014 -0400

    Merge pull request #1567 from howiehu/fix-gist-url-bug

    Update gist tag url to githubusercontent.com

commit 24fdbbbcfaface942ef3000e48564aa62af9ecd7
Author: Hu Hao <huhao@outlook.com>
Date:   Fri May 23 15:45:58 2014 +0800

    fix script_url_for url bug

commit dca0c7500f71236e050576e2e611ac85d71b8b3c
Author: Hu Hao <huhao@outlook.com>
Date:   Fri May 23 12:26:35 2014 +0800

    Update gist tag url to githubusercontent.com

commit ff1b10d0bcfdc44bbdf9c60dd0fe34c3a6ffe31a
Merge: f6ed412 c23be69
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Sat May 17 23:33:19 2014 -0400

    Merge pull request #1563 from tsmacdonald/master

    Use correct time in log message for Github deploy

commit c23be699156d9f01cfe9e5368dc726b50873067f
Author: Timothy Macdonald <tmacdonald@groupon.com>
Date:   Sat May 17 15:08:38 2014 -0500

    Use correct time in log message for Github deploy

commit f6ed4125b56ee28775f0fe1c3ebac7d6ef33daf9
Merge: affa3ff c139f68
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Thu Apr 3 23:59:00 2014 -0400

    Merge pull request #1489 from duckpuppy/fix-update_style

    Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder

commit affa3ffb8233f7b571a46a2c58aff574e470c369
Merge: b868803 ec1fbcc
Author: Brandon Mathis <brandon@imathis.com>
Date:   Sun Mar 9 15:36:28 2014 -0500

    Merge pull request #1515 from rythie/master

    A couple of changes to make octopress more friendly when hosted using HTTPS

commit ec1fbccd64fc429b138369f93c1236a8dedc7ce6
Author: Richard Cunningham <github@richardcunningham.co.uk>
Date:   Fri Mar 7 17:20:01 2014 -0500

    Use HTTPS for google webfonts when on HTTPS site

commit 15e4418aed77fd76ebf5684a76eccdc3adf162d1
Author: Richard Cunningham <github@richardcunningham.co.uk>
Date:   Fri Mar 7 17:19:06 2014 -0500

    Default to HTTPS for google searches

commit b86880352b421ad8884355ba2e2dea9b92c65996
Merge: 0ead88e a66e031
Author: Parker Moore <parkrmoore@gmail.com>
Date:   Mon Mar 3 22:07:48 2014 -0500

    Merge pull request #1506 from duckpuppy/handle-multiple-redirects

    gist_plugin: Handle multiple redirects, stopping if we find a circular r...

commit a66e031166183fde3cccfc0808aff447d5b0157a
Author: Patrick Aikens <paikens@gmail.com>
Date:   Sat Mar 1 10:07:35 2014 -0500

    gist_plugin: Handle multiple redirects, stopping if we find a circular reference

commit c139f680e194435d075b4cc17840d1f502a6a36c
Author: Patrick Aikens <paikens@gmail.com>
Date:   Sat Feb 1 00:20:19 2014 -0500

    Fix typo in update_style copy command

commit 51ad614bd2b5268ea3c7bb7ca8afbb7cafad9dfb
Author: Patrick Aikens <paikens@gmail.com>
Date:   Sat Feb 1 00:09:38 2014 -0500

    Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder