Fix vagrant

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Fix whitespace

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Fix some vimrc situations.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>