Removed some usage of _sa_class_manager since it didn't represent the full model. Fixes issue #319
Merge remote-tracking branch 'upstream/master'
Removed blank line, shortened line, removed duplicate code
Merge pull request #323 from jbkkd/master

Removed some usage of _sa_class_manager