Replaced PIL with Pillow - fixes #1158 - Need to uninstall existing PIL on deploy
changed to Pillow and set htmtmock to >= 1.0.6
import within function to eliminate cyclic import
Merge pull request #1253 from modilabs/signals_cyclic_import

import within function to eliminate cyclic import
Merge branch 'master' into pillow
already configured settings
SECRET_KEY is required for test to run
specify settings module in deploy fabfile
travis preset needs secret code
Merge branch 'master' into structured_settings_B
Merge pull request #1240 from vernondcole/structured_settings_B

Structured settings b
Merge branch 'master' into generic
update settings like master
update settings to match master