better error handling for broken encrypted puffs
Merge branch 'master' of github.com:puffball/freebeer