The Role of Intrinsic and Surface States on the Emission Properties of Colloidal CdSe and CdSe/ZnS Quantum Dots