Merge branch 'master' of github.com:FinalsClub/karmaworld

diff --cc reqs/dev.txt
index 76199773cc68be9165bbac0e765420290ada965b,499e79194d230be5e5cbb702f2e79db710d12d4f..83de61c0d31686391cb22b377e2323c9a49d5b51
--- 1/reqs/dev.txt
--- 2/reqs/dev.txt
+++ b/reqs/dev.txt
@@@ -1,3 -1,3 +1,4 @@@
  -r common.txt
 +django-kombu==0.9.4
  django-debug-toolbar==0.9.4
 -ipython==0.13.1
++ipython==0.13.1