Merge pull request #1 from rhowardiv/topsr2

PSR2 for snap
Relax class name req's; we're not yet namespacing