Add support for animate_flicker option.
Fix git silliness.
Really fix git silliness.