Update `paginate_path` comment based on default value
Merge pull request #1592 from yous/patch-4

Update `paginate_path` comment based on default value
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':
```
Merge pull request #1609 from alindeman/patch-1

Fixes load path issues with ruby-based git credential helpers
.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
Merge pull request #1617 from nickhammond/patch-1

.gitignore Gemfile.lock per previous commit
Delete Gemfile.lock

Follow-up to #1617
remove deprecated gems 'jekyll-page-hooks' and 'jekyll-date-format'
Merge pull request #1622 from raysrashmi/ry-updating-gems

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

This reverts commit 181d620c1c46c644c4319e81edc342ae5a30c067.
Support octopress-hooks and octopress-date-format #1622
Use `octopress-hooks` and `octopress-date-format`

Not applied in 73e540409ceb8bc18048b6a96a4b815fc303ea28.

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

Use `octopress-hooks` and `octopress-date-format`
Set layout to null to avoid page defaults.
Set layout to null to suppress warning

Not applied in 0f1660437beba58cd2974f07270b19305b9bbfd9.
Merge pull request #1629 from yous/patch-layout

Set layout to null to suppress warning
Merge branch 'master' into source

Conflicts:
	Gemfile.lock
Updating  Gemfile & Installing Plugins
スライド載せた
ブログ書いた