fixed issue with overlapping routes
ignore the 'self' argument in argnames_with_defaults
Merge branch 'master' into op_master
added test for overlapping paths
Merge remote-tracking branch 'origin/op_master'

Conflicts:
	webhandler/tests/test_web_handler.py