Add travis dependencies + cleanup