Continuing edits to make gulp work nicely for build/deploy.