Updated bundles, switched to ultisnips for nested snippets