Merge branch 'master' of git://github.com/imathis/octopress into source

* 'master' of git://github.com/imathis/octopress: (112 commits)
  Fix a typo in Readme.markdown
  fix minor mis-spelling
  Removed space to fix HAML compatibility on include_code.
  removed superfluous parentheses
  Use a protocol-relative url to load disqus over https or http
  Error handling FTW
  Clean up Gist redirection.
  Fix Disqus over https.
  Add proper disqus identifier comment count links
  fix old style gist url not found issue
  ".git" added to sample string with SSH repository URL
  Remove .ruby-version file and add note to README regarding minimum Ruby version.
  Update Gemfile.lock.
  Set a fixed version for directory_watcher gem.
  Fixed blog_url for personal github pages projects. #1328
  Fixed setup_github_pages success message. #1328
  Let's use the specified format - https://gist.github.com/fnichol/1912050
  Removed outdated ruby version manager configurations; update to .ruby-version
  Improved readability
  Extract method
  ...

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	_config.yml
	config.ru