add docpad to dev deps
fix merge conflict
Merge branch 'patrickarlt-master'