hopefully travis will work with this commit

DO NOT PULL OR MERGE!