More info. for criteria errors; fixed Python variable bug
Merge branch 'devel' of github.com:abreen/socrates into devel

Kept better criteria import error handling from lagging branch.

Conflicts:
	socrates.py