changed superuser and rabbitmq protocol
ignore DS_Store and fiix flake 8 error
merge confict
Merge branch 'djredhand-master'