simplify feature spec for codeship
update for codeship
update feature spec for merge