Updated tests and docstrings for NineML journal paper
Minor typo in docstring for neuralcomp.makeChannel_halfact
Fixed minor typo in error string

Conflicts:
	PyDSTool/Trajectory.py
Fix 'cond' import for verbose>=10 case
Fix minor typo in string
Merge pull request #33 from robclewley/develop

Develop