Tweak a test that assumed sort order.
Merge branch 'master' into test-state-sorted

Conflicts:
	state/state_test.go

Just a simple "2 new imports added, ended up conflicting" issue.
Merge pull request #808 from jameinel/test-state-sorted

Tweak a test that assumed sort order.

Mongo turns out to always return the order that you inserted, but Tokumx returns keys in sorted order, but the test shouldn't be expecting an order (unless we are sorting in our Find), but AllServices doesn't care to sort.

http://reviews.vapour.ws/r/76/diff/