Disable git merge.ff so merges always commit.

This way when I explicitly want to track a merge it is always tracked as
such, even if it introduces no new changes (i.e., fast-forward). To
fast-forward one can still use git-merge --ff when it's actually
desirable. Otherwise, rebase is probably what you want anyway.
Add MOVIES file. :)

Been keeping track for a year or two of movies watched, [rented], and
interesting. Began loosly rating them too so I would know how I felt
about them after watching them. I figure if I don't want to risk losing
this file I might as well track it and push it up to GitHub.