Change node names directly instead of using relying on reverse dns lookups (#359)

* Move development back to dev branch

* Remove /etc/hosts autogenerate and dnsmaq resolution

* Fix loop on nodes

* Fix count

* Prepare for upstream commit