Fix credentials bugs
Merge branch 'master' of github.com:delicatebits/walrus