Merges the maps.
Merge pull request #39 from Glloyd/master

Merges the Maps
Updated config to reflect Nienhaus as full admin.
Merge pull request #40 from kg333/master

Updated config to reflect Nienhaus as full admin