working on "just reexporting" functionality
Merge branch 'master' of https://github.com/TheChymera/pystim

Conflicts:
	compute_stim.py
Now supporting multiple outputs