Submission 2

Merge travis CI changes