Added aliases
Migrated to vundle