debugging 2.0
Merge branch 'master' of github.com:kylerbrown/spikechef

Conflicts:
	clutoarf.py