Big messy update
Merge branch 'master' of https://github.com/mike-lawrence/ssior

Conflicts:
	labjackChild.py
	ssior_v2.py