Merge pull request #25 from jimmynotjim/v2.0

Phew, I think this behemoth is ready, merging!