removing divshot
Merge branch 'master' of https://github.com/tcrosen/settle
fixing travis config