Uni configurations
Merged conflicts
Added vim bundles folder to gitignore