Fixed a few more bugs with the animation editor. Stubbed out the code that deals with zoom as I'm not sure what purpose it serves but it was causing the editor to break when playing back the animation.
Add some formatting and finish merge from origin.