Allow for multiple nginx server_names
Merge branch 'master' into maps_extralayers