Fixing conversejs version
Adding port mapping for 5280 on vagrant
Updating settings
Changing verion of django-conversejs
Updating django version
Updating puppet manifests
Merge branch 'master' of github.com:TracyWebTech/colab
Adding punjab reqs
Adding punjab.tac file
Installing punjab using puppet instead requirement
Fixing jquery version
Removing punjab.tac
Adding ext folder to gitignore
Bumping django-conversejs version
Fixing fabric

pull should run before pip install
update requirements was on a wrong dir path
Allowing XMPP auto registration
Adding configs to reverse proxy and auth jenkins
Using username again instead of email (again)
Merge branch 'master' into bootstrap

Conflicts:
	src/colab/deprecated/templates/base.html