Fix misc
vundle update
Merge from master