More UploadAttribute changes.

UploadAttribute now has two attributes, upload and subload. When set to
True, these will dictate whether or not __upload__ is called on the
derived Attribute instance. The upload attribute always takes precedence
over subload, if both are set.