p4 untracked and cdp
gitignore netrwhist
vundle changes for unite and vim-aura
merging in upstream