updates to website
Merge branch 'master' of github.com:gregcaporaso/gregcaporaso.github.com