Cleanup

- Add attribution comments
- Use lang.replace compatible template strings
Merge branch 'master-teamcity' into geezer-teamcity