Squash this later; committing for Mat.
Merge remote-tracking branch 'origin/cleanup-and-fix' into berkshelf