Added Gravatar support #2
Added plugin for Gist support #3
Merge branch 'master' into add-gravatar

* master:
  Updated SITEURL, fixes #1

Conflicts:
	pelicanconf.py
Merge branch 'master' into add-gist-support

* master:
  Updated SITEURL, fixes #1

Conflicts:
	pelicanconf.py
Configuration for Disqus
Added disqus bloc to article
Merge pull request #7 from ox-it/disqus-comments

Disqus comments
We're not currently running this js
Resolved conflict
Cleanup
Resolved conflict
Merge branch 'master' into import-legacy

* master:
  We're not currently running this js
  Added disqus bloc to article
  Configuration for Disqus
  Added plugin for Gist support #3
  Added Gravatar support #2

Conflicts:
	content/test-post.rst
	pelicanconf.py