Cleaned up urls.py a little - cosmetic, mostly, but easier to see where things are now