Added additional settings and bundles
Removed two bundles as they were incompatible
Merge branch 'master' of github.com:kamilc/vim-config