WIP Updates

I need to figure out why pagination is broken with 3.1.0 first but the rest are ready to merge @mdo.