added a couple new settings and bundles, conqueterm somehow doesn't run correctly though, so it is deactivated for now
Merge branch 'master' of github.com:terhechte/VimConfiguration