Fix pluginbase incompatibility with django 1.6 #213
do not build docs in build-sdist, it's not needed
Merge pull request #231 from benjaoming/master

Merge changes from master