Updated templates and code to reflect newest best state from aplayr a…#88

bmonkman merged 1 commit intomastercommitdev/zero:masterfrom

pull-in-improvementscommitdev/zero:pull-in-improvementsCopy head branch name to clipboard