Making gem work again

We need to use token instead of userid for all requests now