Added Map implementation

and cleaned up a bit.  Added in and fixed up cooches' leaflet
implementation.  Will clean up later.  Also cleaned up organization a
bit to make this work.