Fix template and build
Merge pull request #21 from mbertrand/gn20upgrade-merge

Partial fix to base template, pavement.py & settings