Rearranged some code in the phong shader; tweaked switching between light source types; right now arbitrary sampler binding is still broken