Put 2.0.0 Beta into master

@stefanpenner I would appreciate a second set of eyes on this code. I'm planning on merging this on Friday unless there are any issues that are uncovered before then.