Remove a load of trailing whitespace and minor travis improvement