Nice clean urls
Tests for underscores.
More better
Merged in cleaner_urls.