Template defaults and better help
Merge branch 'master' of github.com:neontribe/gbptm-ui