Simplified Travis conf file //Will squash this and rebase, it the travis build passes