Started using VIM markers, also added some extra bundles