Pull request?

Josh - I am attempting to pull all of YOUR changes into MY fork.  I have this odd feeling that what I am actually asking here is the reverse. Do you want to review?