Change oscillator type on button click.
Merge branch 'master' of github.com:zacharydenton/synapse

Conflicts:
	client/views/synthesizer/synthesizer.coffee