almost datasync
Merge branch 'master' of http://github.com/mome/biofeedback

Conflicts:
	experiment_computer/stream_manager.py