Mass rename static variables to s_*.
Cleanup Movie.h/cpp.
Merge pull request #1040 from RachelBryk/movie-cleanup

Movie cleanup