Made the routes match optional patterns better.
Merge branch 'master' of https://github.com/Danack/intahwebz-routing

* 'master' of https://github.com/Danack/intahwebz-routing:
  Removed optional items.

Removed debug.