added in the sticky waypoints plugin
Merge remote-tracking branch 'origin/master'
Code cleanup - remove some unnecessary code.