Merge pull request #194 from NoblesseOblige/androidui

Cleaning up some of the mass commit mess