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
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
Updating from remote