Merge branch 'more-configuration'
Merge branch 'master' into power-ups
implemented laser ball power up

see #27, #44
This includes support for ball modifiers that queue up for a player and
apply to the next ball that they hit.
Merge branch 'power-ups'
added a key shortcut for toggling syphon (when on osx)
oops...
Merge branch 'master' into more-configuration