Removing redirects from apache

Now it's all on Django
Updating feedzilla
Moving conversejs to it's own app
Loading conversejs using app
Removing converse.js from colab
Adding converse.js as external dep
Updating jquery
Updating settings
Adding CSS to search page
Fixing responsive for feedzilla posts
Fixing some base.html columns
Merge branch 'master' into bootstrap

Conflicts:
	src/colab/deprecated/templates/base.html
	src/planet/templates/feedzilla/base.html
Changing from seocam repo to lorien [author]
Merge branch 'master' into bootstrap
Updating requirements.txt
Merge branch 'master' into bootstrap
Putting min