Fix up the user resourece to allow password updates but not api key updates and fix up the test
Merge branch 'master' of github.com:openskye/openskye