Changed OriginDestPair to a tuple including priority. need to change
access maps so they use these rather than the priority string.
Merge branch 'master' of git://github.com/rtheunissen/KPSmart-Team-4.git