some changes to setup to hopeful make it work with codeship