add fugitive, remove {{ mapping, add highline
clean up comments