Merged to master

Appears I need to merge to master to get things working (displayName change to be compatable w/ the UI).

This is the merge I did, feel free to pull it in. It wasn't hard, the only trick was to update the createExpringSignature invocations to milliseconds instead of minutes.

I don't know why it's saying there are so many commits in the PR, as I just did a merge. If you just close this and merge your own, I won't be hurt :)