minor randomness
reorganized code some
checkpoint
update to clojure 1.6; massively shrink code since I have learned better ways to do things