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
Added review support for variables
Added lines to output before and after a Python module is imported

...just in case the module has module-level code that produces output
or expects input.
Fixed bug with Python function eval tests

The value of an argument is now created using repr() and
not str().
Enhanced ability to test Python functions

For 'eval' functions, socrates now handles the case where the
student named their function parameters differently than what
the criteria file specifies. socrates falls back on the order in
which they were defined in the student submission.
Added support for special deduction for module import errors

For a Python module, the "error_deduction" attribute can be
specified in the criteria file, which will be used if importing
the submission fails (e.g., due to a syntax error).
Generalized handling of errors during 'eval' tests
Added fix for Python function eval tests with no arguments
Merge branch 'devel'