Clean up android manifest
Make image serialization work.

This required fixing up the image class, and the things that use it.
@lamorie, this might merge-conflict with your stuff, but it will make
your life much easier.
Add image to the deserializers so we can read data from ES
Merge pull request #204 from stephenjust/images

Images