Fixes knime-mpicbg/knime-scripting#38
Merge branch 'python_2.6' of https://github.com/damoser/knime-scripting into damoser-python_2.6

Conflicts:
	de.mpicbg.knime.scripting.python/src/de/mpicbg/knime/scripting/python/scripts/PythonCSVUtils.py
Merge branch 'damoser-python_2.6' into develop