Step edit: Update step on conflict

So the user can remake their changes and perform the save again.
Step delete: Update step on conflict
Fix guide publish URL

It ended up being
/guides/{guideid}/public?revisionid={revisionid}/public which works but
isn't really correct...
Guide publish: Update guide on conflict
Merge remote-tracking branch 'origin/master' into handle-api-conflicts
Step reorder: Update guide on conflict
Guide edit: Update guide on conflict
Guide delete: Update guide on conflict
Merge branch 'handle-api-conflicts'