final changes to template

Satisfied with the state of the template; removing stuff specific to my test env