Modify the job template to build on commits to master and PR. Add new template for github triggers, other small changes