Updated requirements files, now that requirements are on pypi.
Merge branch 'brian-qpid-transport' into bmbouter-qpid-docs-changes
Removing qpid dependency from default.txt
Configuring an 'extra' package named qpid
Merge branch 'brian-qpid-transport' into bmbouter-qpid-docs-changes