Migrate to Vundle and organized shortcuts