update node naming
improvements in Vagrantfiles
fix conflicts