Remove code supporting Rails < 4
Cleanup rspec syntax a bit