Merge in refactor of Simple; all tests pass
Merge branch 'master' of github.com:cgs1019/pyjdb

Conflicts:
	pyjdb/pyjdb.py
	pyjdb/pyjdb_test.py