Add information from doc/hacking.md and doc/make_cheatsheet.md back into contributing docs