Merge pull request #31 from ericedens/settings

Bug 1022105 - Support a menu and settings.
Bug 1045245 - Remove text icon from settings ImageButton