Initial update to be compatible with Jekyll 2
Added jekyll-sitemap, jekyll-date-format, and updated gems
No longer including Gemfile.lock. Turns out that was a bad idea.
Merge pull request #1589 from imathis/jekyll-2

Jekyll 2.0 compatability
Replaced date plugin with jekyll-date-format
Removed date plugin, added excerpt separator default
Update `paginate_path` comment based on default value
Merge pull request #1592 from yous/patch-4

Update `paginate_path` comment based on default value
new local bundle for octopress
reset _yml config
Merge branch 'master' of https://github.com/looseyi/Edmond