Fixed doconce options: - to _ for new doconce version.
Merge branch 'master' of github.com:hplgit/fenics-mixed