GIT History Part 1 of 2 (#1228)

* GIT History Part 1 of 2

This PR is an attempt to make the review and merge of @gelma's #1086 PR in a more manageable fashion. It covers words starting from A to I (hence part 1 of 2). 

There have been some additions as well as squashed down commits.

* Fix error in previous commit