add envelope_greeting to contacts csv export
Added text:pre-wrap formatting to activity comments
Moved comment element CSS to layout.css.scss
Merge pull request #212 from CruGlobal/format-activity-comments

Format both multi-line and long single-line activity comments well
Doubled prayerletters timeout
Merge pull request #210 from CruGlobal/envelope-name-in-csv

add envelope_greeting to contacts csv export
Update sidekiq-pro gem url
Increased prayerletters sync to 5K seconds
Merge branch 'master' of https://github.com/CruGlobal/mpdx
Improve contact merging
Add specs
Refactor contact merging into new class because Contact class got too long for rubocop
Move attributes to simple copy into constant variable