Updated .gitignore -- Added *~ pattern for backup files.
Merge branch 'master' into FANSI