Fix within bug.

The within problem that was commented out now works properly with
proper refactoring.
Merge branch 'master' of http://github.com/geisler/game_contest_server
Updated with Geisler's.  Fixes some sort of bug? Not sure bro
Helper stuff added in class