tree 3ffb118d67d0c4dd1ccc33033df8aa0d4f19bce6
parent 4f83cc3eac8389965702164d1d5f2cf6bfbfb625
parent 9b3c5ee8522b9a88ad2bfb95c9e2b1b9c0617c3c
author Scott Baker <smbaker@gmail.com> 1462298087 -0700
committer Scott Baker <smbaker@gmail.com> 1462298087 -0700

Merge branch 'feature/api-cleanup'