fixed things, switched travis, cross fingers