Merge fix ups

chunk.py

@@ -76,7 +76,7 @@ def get_blockarray(level):
 def get_blockarray_fromfile(filename):
     """Same as get_blockarray except takes a filename. This is a shortcut"""
     d =  nbt.load_from_region(filename, x, y)
-    level = return d[1]['Level']
+    level = d[1]['Level']
     return get_blockarray(level)
 
 def get_skylight_array(level):

overviewer.py

@@ -186,7 +186,7 @@ def main():
     q.append(quadtree.QuadtreeGen(w, destdir, depth=options.zoom, imgformat=imgformat, optimizeimg=optimizeimg, rendermode='spawn'))  
 
     #create the distributed render
-    r = rendernode.RenderNode(w,q)
+    r = rendernode.RenderNode(q)
     
     # write out the map and web assets
     m = googlemap.MapGen(q, skipjs=options.skipjs, web_assets_hook=options.web_assets_hook)