add vim-hdevtools back
use ,r for hdevtools type annotation
Merge branch 'master' of github.com:natw/dotfiles

Conflicts:
	.gitmodules
[vim] add golang ftplugin file