added git_pretty_accept
[#65018592] Added new task to import shipments associated with Trade Names
corrected mismatched names
added a rake task to import all trade stuff
Merge branch 'update_shipments_import_to_import_trade_names_shipments' into develop
now let's all hope git-pretty-accept works as advertised