Add productionState to the add_device API
Minor Makefile change
Merge branch 'master' of github.com:jmaas/zenossctl

Conflicts:
	zenossctl/api.py