Merge branch 'master' into dtt-c-render

Conflicts:
	setup.py

setup.py

@@ -59,6 +59,7 @@ c_overviewer_files += ['src/rendermodes.c', 'src/rendermode-normal.c', 'src/rend
 c_overviewer_files += ['src/Draw.c']
 c_overviewer_includes = ['src/overviewer.h', 'src/rendermodes.h']
 setup_kwargs['ext_modules'].append(Extension('c_overviewer', c_overviewer_files, include_dirs=['.', numpy_include] + pil_include, depends=c_overviewer_includes, extra_link_args=[]))
+
 # tell build_ext to build the extension in-place
 # (NOT in build/)
 setup_kwargs['options']['build_ext'] = {'inplace' : 1}