Try not to stomp on global variables.
Merge pull request #418 from cucumber/pretty_formatter_spec

Pretty formatter spec
Merge remote-tracking branch 'origin/master' into prevent_cucumber_yml_being_read_twice

Conflicts:
	lib/cucumber/cli/options.rb
Merge pull request #416 from cucumber/prevent_cucumber_yml_being_read_twice

Prevent cucumber yml being read twice

closes #217
Update History.md
TagExpression.eval is deprecated, so we use evaluate() instead.
Fixes #420
bumping gherkin version up
More languages added to Gherkin
pending specs passed with new gherkin
Release 1.2.4
History.md updated
I forgot to update the history for my fixes, shame on me
Merge pull request #422 from dkowis/update_history

I forgot to update the history for my fixes, shame on me
Remove the firewatir from the watir example and change it to use webdriver.
Update feature name
TagExpression.eval is deprecated, so we use evaluate() instead.
Fixes #420
bumping gherkin version up
More languages added to Gherkin
pending specs passed with new gherkin

Conflicts:
	spec/cucumber/cli/options_spec.rb
Update History.md