Conflict of interest edits

[Martin Michlmayr]

I'm posting 4 patches to the conflict of interest policy.  I know
Gitorious is down, but I'm posting them now for for discussion.

Patches 1-2 just clarify the form.

Patch 3 says that the form can be filled out in plain text, something
that isn't obvious (or at least wasn't obvious to me).

Patch 4 tries to clarify what type of conflicts have to be declared.
The intro of the policy and the actual form talks about "private
interest" and "persnoal interest", but the policy is actually much
wider (saying that a potential conflict should be declared when
there's an "appearance of a conflict" or a "duality of interests").
Patch 4 tries to make this clearer, but it could probably be improved
even further.

-- 
Martin Michlmayr
http://www.cyrius.com/