Switched to NeoBundle. Added Unite and friends