Adding gopath and vim-puppet.
Merge remote-tracking branch 'origin/master'