Switch back to vundle
use commentary
update mappings