Merged in dgtonge/fapi/ciba-edits (pull request #41)
Improvements to the CIBA spec based on discussion at the face to face meeting and comments to the relevant issues.
Improvements to the CIBA spec based on discussion at the face to face meeting and comments to the relevant issues.