Some changes, couple vim bundles