Raise 404 if no object found for object_json
Added 'joint' to the valid chamber values in vote schemas
Merge branch 'master' of github.com:sunlightlabs/billy

Conflicts:
	billy/web/admin/views/__init__.py