hacks to get stuff working on tscc
fixed merge issues
Merge branch 'clip_analysis_updates' of https://github.com/YeoLab/clipper into clip_analysis_updates
updated stuff so generators don't break, there is still a bug though