travis-ci re-enabled (seems working again)
Merge branch 'master' of github.com:impactcentre/interoperability-framework