Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Fix typo in update_style copy command
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
Use correct time in log message for Github deploy
Merge pull request #1563 from tsmacdonald/master

Use correct time in log message for Github deploy
Update gist tag url to githubusercontent.com
fix script_url_for url bug
Merge pull request #1567 from howiehu/fix-gist-url-bug

Update gist tag url to githubusercontent.com
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
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
Ignore Gemfile.lock & Remove .ruby-version
Merge remote-tracking branch 'octopress/master' into update-octopress

Conflicts:
	Gemfile.lock
	_config.yml