Merge branch 'master' of git://github.com/sall/vixen
Fix color intents on the preview
Add border around effects in sequencer removed in error for a previous commit
Merge remote-tracking branch 'remotes/derekbackus/master'
Fix inefficiency with spin and chase effects: don't bother rendering background info if there's not a nonzero background intensity.
Fix the color combining of multiple color intents: actually calculate the alpha properly (in HSV/HSL space).
Refactor the color intent color work slightly, so it's clear if you're getting an alpha affected or opaque color.
Remove some unused code from the preview; looks like it's previously been refactored.