Make v1.0.x the master

Simplify the tree by merging the v1.0.x branch into my own master. Development is based off this branch anyway.