update
Merge branch 'master' of github.com:dhaffner/dhaffner.py
add more tests, remove unused funcs from iterators, style cleanup