Updated django-conversejs and diazo versions
Merge branch 'update_puppet' of github.com:colab-community/colab into update_puppet
Changed VM base names
Install pkg_resource before using it
security_updates breaks bootstrap.py