Adopt usual singleton idiom
Merge pull request #104 from fightingwalrus/waypoint-helper-singleton

Adopt usual singleton idiom