Extra stuff to unit test
Merge branch 'master' into cheddar/test
return the userid on refresh
Merge pull request #2 from tidepool-org/cheddar/test

Extra stuff to unit test - all good test now passes