updated travis file - cp accounts.yml.dist into accounts.yml
Merge branch 'master' into admin