Commenting out nginx server config for dev.  Fixing paths for fabfile.
Fixed indentation error from merge.
Merge branch 'master'