I Can't Believe It's a File Upload
Merge remote-tracking branch 'aebsr/master'

* aebsr/master:
  I Can't Believe It's a File Upload
Consolidate file control definition

We don't really need a base control since there's nothing extending it.
We can also get rid of the unused widgetTemplate.