Formatting & bug fixing animations.  Lame, same CL, I know...
Add "O'" & "OH" options
Merge pull request #2 from dearmash/master

Round out the changes