puppet-lint: fix "tab character found on line" by using :retab in vim
with 2-space soft tabs (tabstop=2,shiftwidth=2,expandtab)

PS2: add vim modeline, fix indentation per comments on PS1

PS3: rm trailing whitespace, wrap user class (long line)

Change-Id: I119c037c87be1f037f6e48d3baaae8866e9e076c
Merge "puppet-lint: fix "tab character found on line" by using :retab in vim with 2-space soft tabs (tabstop=2,shiftwidth=2,expandtab)" into production