Merge branch 'osx'

Conflicts:
	vendor/rhtml
	vendor/yasnippet
Add tagc snippet for html and similar modes
Add go-mode