updated travis setup
Merge remote-tracking branch 'ph/develop' into develop