Fixed fabric deployment merges.
Commenting out nginx server config for dev.  Fixing paths for fabfile.