revert travis configuration for now
merge with master