Merge pull request #20 from eileenmcnaughton/4.2

Per BGM's comment I am merging this in - seems OK to me. A couple of other commits in this pull that are pretty safe
CRM-12835 Display relationship description on relationship tab