convert_to/from_extras leaves values in extras dict after converting them from extras to top-level fields

@amercader You said you had a fix for this

See issue https://github.com/okfn/ckan/issues/376 for initial discussion of this