Fixes per rogpeppe review. Update macaroon import paths to gopkg.