more pep in settings
Merge branch 'master' of github.com:averrin/emergent
django to travis
django to travis #21
django to travis #21
django to travis 3th try #21
django to travis 3th try #21
django to travis 3th try #21
add test_settings for tests #21