fix plugin conflicts
resolve conflicts
update for dvtm mapping
neobundle update