changes for linux compat
Merge branch 'master' of sccs.swarthmore.edu:/Services/Git/aburka1/septaudio

Conflicts:
	demo/tracker/tracker.py
soundlazer system id data gathered in detkin