Post mailer fixes merge

 - Refactored Support service

 - Small test fix to make all tests pass

 - Added Pry the dev group in gemfile