Features 2.x upgrade with manually created image_field

Things are starting to shape up.