Prioritize Eq/Order to avoid ambiguous implicits.
Re-prioritize implicits to avoid ambiguity.
Merge remote-tracking branch 'upstream/master' into topic/serializable-all-the-things

Conflicts:
	core/src/main/scala/spire/optional.scala