More rubocop fixes
Fix my broken fix
Undo aliasing of fail which is a ruby keyword.  Doesn't seem to be used inside the gem, probably isn't used elsewhere