Reams of code markups after internal review.
Merge pull request #41 from Metaswitch/markups2

Reams of code markups after internal review.