can mark task as complete

able to mark task as complete
added strong consistency

I was having problems with the datastore being inconsistent with when it
saved an entity.  This fixed that.
fixed merge conflicts