Changed script so that it contains current week when run rather than prior week since we run on saturday instead of sunday mornings.
Fixed merge conflicts.