removed vundle copy, added some settings from vim-annoyances