Add rules for all kinds of trash to .gitignore.
Merge branch 'devel'