Getting homepage in line with wireframes

https://github.com/mozilla/CSOL-site/issues/116
Merge pull request #138 from andrewhayward/homepage

Merging homepage layout