Merge travis testing file into develop