does the right thing now
Merge branch 'master' of github.com:shackspace/soundflower