Removed settings.py -- we use kwargs now
Merge branch 'master' of github.com:berkona/pyacollab