Make sure delay does the right thing, even when show is short enough to not cause millis to change - #71
Merge branch 'FastLED2.1' of https://github.com/FastLED/FastLED into FastLED2.1