Added the extension *.~ to .gitignore.
Resolving conflicts by merging branch 'master' of https://github.com/goddardl/gaffer into ImageTransformNode