Clean vim cruft and spacing

Signed-off-by: Aram Price <aprice@pivotallabs.com>