clean up template; move a few defaults into specs
remove some junk from uaa config

This will probably break things. But I want to see how.