Avoid trunks too if "avoid_motorway" is selected.

Trunks are already considered as motorways in the "prefer_motorway" option below so make it consistent. This should fix ticket 811, which is now inaccessible to me due to unknown reasons.
Merge pull request #242 from aceman444/master

Avoid trunks too if "avoid_motorway" is selected.