Bug 962307 - Gigabit Fund website

Opening this PR with two commits to more easily see what I've changed, but we'll squash for the merge.

This replaces pull #1655