Reconcile template with standard
Automated merge with git+ssh://github.com:jasonbot/foaas-impl.git