Fixing typos.
Upped version to 2.0.0pre1.
Merge branch 'master' into dsuch-t-gh324-zmq-green