clean trailing whitespace
initialize serialized_uploaders class ivar with superclass value if possible
Serialized field should default to {} if it is nil
Merge remote-tracking branch 'schnittchen/master'