First Master pull...10/28

Pulling from Will's master branch....this has everything that we have been working on for the past 2 months.  I am pulling this down because we do have enough to show on ungmap.com