tree cdfd337cce5fa65ccea43f18f9853160235cc4b0
parent 272ec45e8538bec176203536d12aed402b9c78e1
parent bc3603670e205cb3a34780ef79599d96b82ab200
author Scott Baker <smbaker@gmail.com> 1459467887 -0700
committer Scott Baker <smbaker@gmail.com> 1459467887 -0700

Merge branch 'feature/api-cleanup' of github.com:open-cloud/xos into feature/api-cleanup