updates to main nav and that content
Merge pull request #13 from Ecotrust/gh-pages

get emma's changes