Some changes to starcluster
Vim bundle changes