Revised layout
Merge branch '2014-update' of github.com:kiln/carbonmap.org into 2014-update