Setting master and data node after upgrate to 2.0

I have upgraded to Elasticsearch 2.0 and the new config doesn't have a setting for master and data nodes. Do I just add this in or am missing something?

Thanks,
Michael

Perhaps this recent thread is helpful:

I'm also updating the docs to make this clearer.