Update from templatestack

This project had not been brought in line with stacks standards in some time.