ignore the tramp file
Merge pull request #541 from hbin/ignore-tramp-file

ignore the tramp file
Pull in upstream changes