Master Template update

you will need to update your env.properties
Deleted cruft from old repo