small fixes, plus better deps
Merge branch 'master' of github.com:splendido/accounts-templates-core