Version bump to 3.3.0

Resolves #400

Only merge after these PRs have been merged: #407, #406, #396