updated setup.py to point at j2labs/schematics
merged changes from master