Added list of conventions
Merge remote-tracking branch 'saivann/dev' into txes

Conflicts:
	en/developer-guide.md
Added a few more tweaks to the conventions primer.
Reviewed my own diff and discovered a few mistakes.  Now corrected.
Merge remote-tracking branch 'saivann/dev' into tweaks

Conflicts:
	en/developer-guide.md
Merge remote-tracking branch 'saivann/dev' into tweaks

Conflicts:
	en/developer-guide.md
Removed eliding from RPC command arguments per suggestion by Saivann.
Merge remote-tracking branch 'saivann/dev' into tweaks
Merge pull request #11 from harding/tweaks

Added a conventions guide to the top