Added vagrant/puppet info to create barebones workspace
android and java added to vm
Added android platforms in puppet, fixed a script that had been broken by github server rearrangement