Clean up bundles script
Remove old file
Clean up vimrc
Add yankstack mappings
More vimrc clean up
Merge branch 'master' into grapefruit