Code style & docs.
Merge remote-tracking branch 'origin/7.x-1.x' into 7.x-1.x
Merge branch '7.x-1.x-labels' into 7.x-1.x
Merge branch '7.x-1.x' of github.com:eileenmcnaughton/civicrm_entity into 7.x-1.x