Restoring travis build

Opening this and merging
Working again woot \o/