Api doc improvements and better handling of __version__

Same as previous pull request, except the questionable change to createOrUpdate has been removed.