Updates for travis

Trying to get travis to go green.  Don't merge!