Time to merge and stitch
Merge branch 'scikit_preprocess', and submitted.

Conflicts:
	Makefile
	preprocess.py
BAKA. Forgot to square root
Update make to delete directories that it makes
Update README.md
Merge branch 'master' into scikit_preprocess

Conflicts:
	Makefile