added functions to do raster plots of spike trains
changed names of some variables in mi_comparison_discrete also fixed some errors
added function to merge distribution of words in parsing.py
changed nh as a parameter that is given at the begginign, I think it is now fixed somewhere within the file. I am not really sure what changed... oops