completing upgrade of rails to 4
changed rspec expectations to new format using the transpec gem