Re-arrange vagrant provisioner

bootstrap better accomodates other environments (e.g. server)
Use local files to store network info
Add git
Match variables to template
Skip if not set
Fix supybot config generation