fixed gulp for new structure
Merged www into root

Folded www down
Updated gulp
Updated upload-to-s3