Small fixes
New Docpad version, let's see how that goes
Merge branch 'develop' into staging