use id_ to reference state ID, instead of name, so that "name" and "names" can be passed as kwargs
Merge branch 'master' into use-id

Conflicts:
	nacl/state.py
Merge pull request #2 from mgwilliams/use-id

use id_ to reference state ID