Remove kombu 1.4.3
Adding upgraded kombu, 3.0.22
Remove amqplib 1.0.2
Add amqp 1.4.6
Merge pull request #1421 from paulproteus/use-newer-kombu

Use newer kombu

This (hopefully) fixes an issue that @moijes12 ran into, reported on IRC, where a newer system-wide version of msgpack installed causes tragedies.

See also https://bugs.launchpad.net/devstack/+bug/1134575
Fixes comment for recent change to json
Merge pull request #1423 from willingc/doc-comment

Fixes comment for recent change to json
Removing settings link from nav bar
Add widget to join battleforthenet
updating tests.py
Merge pull request #1426 from Deborah-Digges/master

Removing settings link from nav bar
This is a fix for issue 1341.

All references to +projects have been changed to project.

Also, 2 tests that tested the redirection of +projects to project have
been removed.
Update invitation_email.txt
Merge pull request #1429 from moijes12/master

This is a fix for issue #1340.