Merge pull request #20 from sli-fox/steph_branch

Steph branch
Committing All
Some waypoint-map updates
Merge pull request #21 from sli-fox/marky_branch

Committing All
Integration with tower code