man git-pull
Merge remote-tracking branch 'origin/site-2.1'

# By Brandon Mathis (391) and others
# Via Brandon Mathis (117) and others
* origin/site-2.1: (453 commits)
  Travis config for site-2.1 branch.
  same minor "for example" fix, on correct branch
  Updated bit about using heroku toolbelt, because the gem is deprecated.
  Heroku deploy docs now specify use of Heroku Toolbelt. Fixes #918.
  Removing docs for jsFiddle tag. Depends on #896
  Added link on several doc pages to the appropriate pygments page describing supported languages.
  Demystified GitHub Pages repo setup. #817.
  Update source/docs/deploying/github/index.markdown
  Added note about .[bash]_profile issue to docs. #855
  New docs for new Gist tag.
  fixed typo for include-array plugin
  Merge pull request #509: docs for left-aligned pullquotes.
  Added instructions for dev issues.
  Use new Google Group for support.
  added a test for escaping liquid tags in code blocks
  Now code blocks automatically escape liquid {{ and {% characters fixes #745
  updated latest
  Fixed typo while including custom/page_meta.html
  fixed path on rbenv docs
  Updated documentation for setup and installing rbenv and rvm
  ...

Conflicts:
	.rbenv-version
	.themes/classic/sass/base/_typography.scss
	.themes/classic/sass/partials/_syntax.scss
	.themes/classic/sass/partials/sidebar/_twitter.scss
	.themes/classic/source/_includes/asides/github.html
	.themes/classic/source/_includes/head.html
	.themes/classic/source/javascripts/github.js
	.themes/classic/source/javascripts/modernizr-2.0.js
	.themes/classic/source/javascripts/octopress.js
	.themes/classic/source/javascripts/pinboard.js
	.themes/classic/source/javascripts/twitter.js
	.travis.yml
	Gemfile.lock
	Rakefile
	_config.yml
	plugins/blockquote.rb
	plugins/category_generator.rb
	plugins/code_block.rb
	plugins/include_code.rb
	plugins/preview_unpublished.rb
	plugins/pygments_code.rb