Fix bug with Expression to_dot method

The Implies and ITE classes no longer have an 'args' attribute.
Use p,q and s,d1,d0 instead.
Reorder p,q and s,d1,d0 lint good names
Ignore a few x variable names