fixed a bunch of problems with previous merge
merge in the homepage-redesign branch as best as possible; at least one problem came up that I didn't fix, and am committing in the hope someone else will see how to do that and to keep allow work to continue without further diverging: on the callforservice page, some of the markdown isn't rendering correctly
Merge pull request #105 from bepetersn/master

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