Add vim to all machines.

It's really annoying not having it there.
Fix lint errors
Merge pull request #2 from alphagov/add-vim

Add vim to all machines.
Merge branch 'master' into add-curl

-- blame @pbadenski if this blows up

Conflicts:
	manifests/machines/base.pp