compatibility tweaks in integration code
Merge branch 'gh-pages' of git://github.com/jywarren/ruthandjosh into jywarren-gh-pages
merge jeff's changes, with slight modification