Make adjustments to file load order, downgrade webmock dependency
Change around block to use cahced username
v.2 - remove wholesale, add private, remove tradeinxclean