Add backup to gitignore.
Merge with master.