[Finishes #74329822] Ability to show more than 8 honey

Likely won't commit until tomorrow, since I'm about to head out.

Previously we couldn't display more than 8 honey/nectar collected.  This makes it so that we start compacting our counter images as we get over 8.  I then also did some code cleanup.

![image](https://cloud.githubusercontent.com/assets/1767466/3464108/39964b2a-0246-11e4-8d37-0cb392b49781.png)

Nice refactor