Adds the edits that I made and Tom's edits to that

(i.e., this is what's in the trailer we sent to Marty:
http://vimeo.com/87194543)