Resolved silly merge conflict which must have resulted from bad checkout HEAD.
Merge branch 'master' of ssh://github.com/chstan/FuzzyJets