Change internal routing structure to non-bitmask
Merge branch 'two-routing-internals-shakeup' into new-two-dot-oh

Conflicts:
	lib/class-wp-json-server.php