Intermediate commit to allow a pull-merge
Merge branch 'master' of https://github.com/CIIR/julien
Refactored Maxscore and WeakAND a wee bit to improve performance. Also moved some shared code up.