Assorted test cleanup, getting my way around the code.
Merge branch 'upstream/master'

Conflicts:
	app/controllers/artists_controller.rb
Merging conflict resolution
Geocoding corrections, user_controller spec corrections of field types
More test cleanup
More testing cleanup
Minor modifications to titles.
Fixed up permalink migration and data lookup
Permalink testing
Merge pull request #1 from paul-christmann/master

Testing Cleanup