much updating of unittests, and rearranging of files
fixing pull problems
Merge branch 'master' of github.com:nitetrain8/pysrc
cleaning up some files
still fixing