Added options to display peaks and/or data points in methylation plots
renamed variables.
Merge branch 'master' of
https://github.com/apfejes/epigenetics-software.git

Conflicts:
	Epigenetics/Illustration/ChipseqPlot.py