Fixes based on Amy Brown's checking
Merge branch 'master' of github.com:gvwilson/site
Taking some of Jon's ideas for layout