Merged lampeffects.
osc toggles.
Merge branch 'master' of https://github.com/HalfdanJ/Obscura-RF2013

# By Jonas Jongejan (1) and Obscura Hackintosh (1)
# Via Jonas Jongejan (1) and Obscura Hackintosh (1)
* 'master' of https://github.com/HalfdanJ/Obscura-RF2013:
  syphon triangles
  triangles