improved travis; removed local testing conflicts