Code clean up travis support yada yada.