Only run travis on master and develop
Merge branch 'develop' into Q
Don't need to bind functions that are only called once
getContext returns a promise