Merge remote-tracking branch 'github/base-site-2-0' into base-site-2-0

Reviewed and Commented on changes made by Taylor