Force tests rebase

New PR of #31

@dcarroll @kcshafer @haagen

This is just an updated rebase of the changes from the other PR. Looks like Master got a little borked at some point with a merge that was out of order so I had to do some weird merging of the other changes back in. Hence the additional merge commit and update of Readme showing up. Hopefully this cleans the last of it up for future pulls.