Make click button less ambiguous, use new RSpec expectation syntax,

and Ruby 1.9 hash syntax.