Tweaking Heuristic

I think I might redo it, first doing the combination stuff I'm working
on now, flagging those that I've done already and then doing complicated
logic on the rest.
Keep track of which terms have been handled

Lots of refactoring.  Will return later
small refactoring in IDES
Fixed NPE in NumberSelectScreen

Should use selected after it has been null-sanitized
Merge branch 'story' of https://github.com/thomaswp/tuxblocks into story
More Findbugs things

Note on the change to Grid.java: see explanation of final methods being
called from constructor at
http://stackoverflow.com/questions/7477553/in-java-is-there-a-legitimate-reason-to-call-a-non-final-method-from-a-class-co