updating the main dist script with updates from the test site.
Merge remote-tracking branch 'origin/master'