changed all the occurances of "disp" to "dispersion"
fixed some pep8 issues
Merge pull request #23 from wkerzendorf/refactor_dispersion

Refactor dispersion