changes to allow for links in expand text
Merge branch 'master' of github.com:waybury/waybury.github.com