Cleaning up the pythong code
Merge branch 'python' of github.com:salehqt/swarm into python