Added codeship image
hopefully fixed testing issue
Added new test
Fixed readme conflict