modify visitor find_or_create_by

it seems that when specifying the user scope in the front that ruby 1.9.3 will query all visitors for that user instead of limiting by the visitor_identifier. By moving where we specify the user we get the query that we want in both 1.8.7 and 1.9.3
update remaining find_or_create_by_identfier calls
update test to match newest code
Merge branch 'ruby-1.9.3-upgrade'