Upgrade to ruby 2.1

- fix rubocop warnings
 - disable rubocop since some warnings should
   not be fixed and cannot be silenced; in particular trailing
   comma's in multiline hashes.


@martijnrusschen review?
@markijbema: You might want to consider whether it's worth it to re-enable rubocop and accept limitations on trailing commas.