Remove extra steps in file upload

Also, allows custom dimensions on images to override image style defaults.