Refactor Setup thor tasks for travis