VVVV Spyke and Ethics (initial batch)
Merge branch 'master' of https://github.com/hcilab-um/STim