Merge branch 'master' of https://github.com/rigoneri/syte
Merge branch 'master' of https://github.com/rigoneri/syte
Merge branch 'master' of https://github.com/rigoneri/syte
Merge branch 'master' of https://github.com/rigoneri/syte
added pic to readme-imgs
added image and url link to README
Merge pull request #200 from ChristianRahn/master

Added pic to readme-imgs, color #121f6b
Merge branch 'refs/heads/master-2'
Removed duplicate disqus_integration_enabled declaration
Support for Flickr
include the flickr JS file when compressing
Update the documentation
Merge pull request #208 from manavo/duplicate-disqus-enabled-var

Removed duplicate disqus_integration_enabled declaration
Merge pull request #209 from manavo/flickr

Support for Flickr
Fixed issues with twitter api. Fixes #224
Merge branch 'master' of https://github.com/rigoneri/syte
Updating to v2 since it's caching v1
Merge branch 'master' of github.com:rigoneri/syte

Conflicts:
	syte/templates/base.html