Cleanup finishBrewing a bit
Skip glass bottles as well

Fixes #1859