Merge remote-tracking branch 'github/pull/288'

diff --combined cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 0d536322839046d6c546516799e322b82f5d7710,71da3be9ada758bbf2b677f136f8e9e661dee81b..fb03fca5546cd6134271f6fcf888b4d19e6e8b47
--- 1/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
--- 2/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@@ -93,6 -93,7 +93,7 @@@ map $http_referer $denied_referer 
    'https://www.google.com'         1; # Faked
    'https://google.com/'            1; # Faked
    'https://www.google.com/'        1; # Faked
+   'http://www.microsoft.com/'      1; # Faked
    '~^https?://pmap\.kuku\.lu/'           1; # Too much traffic
    '~^https?://[^.]*\.pmap\.kuku\.lu/'    1; # Too much traffic
    '~^https?://fastpokemap\.com/'         1; # Too much traffic
@@@ -101,10 -102,6 +102,10 @@@
    '~^https?://[^.]*\.pkget\.com/'        1; # Too much traffic
    '~^https?://twpkinfo\.com/'            1; # Too much traffic
    '~^https?://[^.]*\.twpkinfo\.com/'     1; # Too much traffic
 +  '~^https?://9db\.jp/'                  1; # Too much traffic
 +  '~^https?://[^.]*\.9db\.jp/'           1; # Too much traffic
 +  '~^https?://clustrmaps\.com/'          1; # Too much traffic
 +  '~^https?://[^.]*\.clustrmaps\.com/'   1; # Too much traffic
  }
  
  map $http_referer $osm_referer {