Fix rubocop and failing tests, come on travis
Merge