ignore live tests in setup.py unless explicitly called
Merge branch 'development' into misc_fixes
Merged in misc_fixes (pull request #59)

ignore live tests in setup.py unless explicitly called
class restructuring
Merge remote-tracking branch 'origin/development' into development
Merged in misc_fixes (pull request #60)

class restructuring