Don't require rubocop
Clean up some parsing, fix an upload breaking bug