More updates to try and get travis ci working :(