base template updates
Merge branch 'master' of github.com:jason-s-davis/gw_dev