1.0.0

See commit messages. Basically, this wraps up two of the outstanding pull request and slaps a real version number on the thing.