Some minor changes.
src/tracy -> src ; soxy -> tracy/soxy
Merge branch 'master' of github.com:MerlijnWajer/tracy

Conflicts:
	src/tracy/Makefile