first test for convergence feature flag
make the initial test pass
the other test
and it passes
clean up import
lint for the lint god, fuzz for the fuzz throne
Merge branch 'master' into convergence-feature-flag

Conflicts:
	otter/test/test_convergence.py
lint
Merge pull request #800 from rackerlabs/convergence-feature-flag

Convergence feature flag evaluation function
Merge branch 'master' into execute-converge

Conflicts:
	otter/convergence.py
	otter/test/test_convergence.py
better name - thanks @radix