Unsubmodule bibpy and mixit to make github.gh-pages happy.
Merge branch 'master' into gh-pages