added a few improvements from vim-puppet