my conf done
VIMTODO added
Merge branch 'my-conf' of https://github.com/rewiko/conf-vim into my-conf

* 'my-conf' of https://github.com/rewiko/conf-vim:
  my conf done

Conflicts:
	bootstrap.sh