2.0

Hmm, the spacing might have gotten weird when I took out the merge conflicts, but here's a try that can be automatically merged.