Make datastore.entity PEP8 and pylint compliant

This really sucks that `git` is so confused about what has changed.