Reverted to a 'bare-bones' vim setup