big push. set up was and have most of the config files up and ready to start deploying
small local settings change
small local settings change
Working Django-SocketIO
Merge branch 'jonathan' of github.com:rickling/cards169 into jonathan