renamed vagrant.rst
added a todo about roles in toyproject.rst
made unmergeable
removed extra info
Merge remote-tracking branch 'upstream/unmergeable'

Conflicts:
	team_project_workflow/attendees_and_learners.rst