Added .vim/syntax/puppet.vim
Merge branch 'master' into cobalt
Updated .vimrc
Merge branch 'master' into cobalt
Edited PATH on cobalt