(mostly) successfully merged homepage-redesign branch with Sarah's changes

I say mostly because I seem to have created a bug somehow in the process. I'm hoping committing will allow someone else will see how to fix it. But I really didn't want work to be allowed to stall more from branches diverging. Bug is:

On the callforservice page, some of the markdown isn't rendering correctly, from the callforservice_rail.md file. Very annoying, will post a bug for it.