Lots of stuff

Started to implement some of the style polishing. Added the new process
to add movies (store_movie.php is still pending completion). Pre-loaded
some graphics for an insert script I'll add to pre-load a bunch of
movies.
Another round of conflict resolution commits