cancel/add routes working.
Merge branch 'master' into mcFriday
Taken it as far as I can with demos.
Merge pull request #151 from amida-tech/mcFriday

Mc friday