Streamlined bash prompt for master branch
Only show user in prompt for non-root
Update vim syntax highlighting etc file from rodjek/vim-puppet
Merge pull request #405 from joshsamuelson/feature/prompt

Shorter bash prompt
Merge pull request #406 from casharma/update-vim

Update vim syntax highlighting etc files from rodjek/vim-puppet