remove undocumented custom variables
add user_id custom variable
Merge pull request #3682 from dimagi/custom-vars

Custom variables in google analytics