Merge branch 'master' into update-profiles
UCSF: use unwrapped Profiles API
Merge pull request #140 from Trott/update-profiles

Update profiles