only run travis on master
optimizing the Promise.when behavior a bit more
Merge branch 'master' into monax
clear up test structure