Refactoring addSidebarToggler()
Merge pull request #1586 from simonewebdesign/master

Refactoring addSidebarToggler()
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
Merge branch 'master' of git://github.com/imathis/octopress

* 'master' of git://github.com/imathis/octopress:
  No longer including Gemfile.lock. Turns out that was a bad idea.
  Added jekyll-sitemap, jekyll-date-format, and updated gems
  Initial update to be compatible with Jekyll 2
  Refactoring addSidebarToggler()

Conflicts:
	Gemfile.lock
Update Octopress
Replaced date plugin with jekyll-date-format
Removed date plugin, added excerpt separator default
Merge branch 'master' of git://github.com/imathis/octopress

* 'master' of git://github.com/imathis/octopress:
  Removed date plugin, added excerpt separator default
  Replaced date plugin with jekyll-date-format
Update `paginate_path` comment based on default value
Merge pull request #1592 from yous/patch-4

Update `paginate_path` comment based on default value
Images
Merge branch 'master' of git://github.com/imathis/octopress

* 'master' of git://github.com/imathis/octopress:
  Update `paginate_path` comment based on default value
Change Disqus shortname.