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

ignore the tramp file
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  ignore the tramp file