fixed broken travis config
Merge branch 'develop' to fix broken travis config