Start standardising on :amp as a control for amplitude rather than vol
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/overtone/sc/sample.clj