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

ignore the tramp file
stopped highlighting issue in makefiles
Merge pull request #544 from mhauserr/master

Create go mode and fix whitespace issues
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore