Figured it out guys. When the shop put my fog lights back together, they put my hid ballast connector on backwards and that was causing the short since the turn signsl runs off the fog light connector as well. Phew! Glad it was a simple mistake and not a costly one.