Swap order of relationship/rivalry and relation.  It was built to be easy to change/add/remove elements, so most of this commit is just changing the examples.