A lot of cleanup + Shippable.
Added Shippable and CodeClimate badges
Merge remote-tracking branch 'origin/master' into kj/active_admin_integration
Added test.