Tidying up configuration, to include option of setting bootnode host