add preliminary fabric experiment
resolve fabfile merge, fix typos in deployment.py
use NGINX proxy to get websites out of AWS network
move credentials into fabfile
Tinkering with fabfile
Updated gitignore for second credentials file
Added deployment.py fixes, corrected settings integration
Merge pull request #1 from BFriedland/deployment2

Deployment2 merge into BFriedland's fork's master for testing