Updates to get travis ci working