Consistent variable naming

Consistently name Mozilla Sync User ID -> $syncId
Merge branch 'refactor_var_names' into mozilla_sync_1.2