Set up chai-as-promised for nicer Promise handling in tests
Merge branch 'master' into ux