grr...
More cleanup.
More cleanup.

Also added a rule to .gitignore for backup files, i.e. *~
More cleanup.