Template update

Merging updates from project-template and new features from phake-builder.