Tools sync
Sync setyp.py
More sync
Add IncidentState
test JSON.states()
Don't need mock yet.  Do need pyflakes.
Merge branch 'master' of github.com:burningmantech/ranger-ims

Conflicts:
	Server/bin/_build.sh
	Server/bin/develop
	Server/bin/pyflakes
	Server/bin/python
	Server/bin/test
	Server/ims/test/test_data.py