Merge pull request #155 from alexmckenley/dev

Implemented listenId's instead of passphrases