update makefile
Merge branch 'master' of jackjack:blog_quack1
Merge branch 'master' of jackjack:blog_quack1
Set disqus to https
Update pelicanconf to pelican 3.3