Merge pull request #97 from tamcap/develop

TamCaP's ssh key
Merge pull request #98 from tamcap/develop

New pub key
Changes to APIs to fit the new models
Makes API work. Now we use our internal IDs vs. external IDs in the API.