merging this branch with pressbooks/pressbooks dev branch

keeping branches in sync. Will now work with WP 3.8+