20140823fix-conf.py&themes
Merge branch 'master' of https://github.com/zhukite/zhukite.github.io