Add all prefixes to keyframe spec version, fixes #301

Latest versions of chrome are using the keyframe spec version but are ignoring unprefixed animations. Adding prefixed versions to spec keyframes fixes this.
Fix merge conflict