added additional tables to models, and fiddled with some classmethods
PEP8
Merge pull request #38 from thequbit/master

some dev, but mostly PEP8 stuff.