Some changes for travis
Updates to settings
Refactor API for tools