Updated for new MagicHat design.  Added Android metadata.

This version is complete.  Still needs performance improvements.