Fixes #15
Merge branch 'master' of github.com:colinoflynn/pico-python

Conflicts:
	ps6000.py