make forward/back and bookmark play nicely with site
Merge pull request #8 from cjfuller/master

make forward/back and bookmark play nicely with site