Merge branch 'NetHack-3.6'

doc/fixes36.3

@@ -18,6 +18,9 @@ glob pricing did not consider weight properly
 glob shop interaction improved to handle more of the expected scenarios
 non-flying steed on Plane of Water would drown when air bubble moved hero
 xans fly, but could not reach your feet if you flew
+adjust vortex database entry to be consistent with fire and energy vortices
+when co-located with a boulder you could sometimes swap places with pets of
+	any size
 
 
 Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository