Merge branch 'master' of github.com:alexholt/toneblaster

Conflicts:
	spec/SaveLoad.coffee