Makefile fixes, cython version update
forgotten files
Settings format changes