Updated for epi week 36.  Improved map vectors
Merge pull request #2 from SimonbJohnson/master

Updated for epi week 36.  Improved map vectors