Refactor Activities
 - Break apart behavior versus view in the UI
 - Update to Android Gradle 0.9 plugin
 - Work around manifest merging bug