Cleanup spec_helper
Disallow old should syntax
Fix whitespace
Release v2.1.0