Commit mostly to get travis back in a sane state