Dispersion change

This PR is aimed at replacing the clunky `.dispersion` and replacing with `.wavelength`, `.frequency` and `.energy`. 

`.dispersion` still exists but is not listed in the documentation - I think for now that's a good compromise. 

(this PR is based on #36)