tree d87784b26ad9715d1f3cd6d7f8ec0cdcbcde3159
parent 1e3044e206a0cb1a2da2554430c099335fc10630
parent b98e1023cb10ec52a4e2a956dd81fc03864eff28
author Scott Baker <smbaker@gmail.com> 1462572190 -0700
committer Scott Baker <smbaker@gmail.com> 1462572190 -0700

Merge branch 'feature/api-cleanup'