Console wasn't being set as executable for some reason, making it explicit chmod
we dont want any vendorized gems
dunno what this is
rubymine trash
trying to make bundler work
OMG IT WORKS
fixing active_support requires for ActiveSupport 3.x
This is something I want to run before every test, not on the spec context
adding ruby-debug to the development dependencies (well need it)
adding Selenium to test requires
Merge branch 'bundler'
Making fixtures more testable. All tests pass!
Added rspec2
Merge branch 'rspec2'

Conflicts:
	Rakefile
Removed taglob. No ability to use ENV[TAGS] now. Use rspec tags.
deleted rdoc folder
added custom formatter for failing_examples
Merge branch 'master' of github.com:hammernight/taza

Conflicts:
	rdoc/classes/Array.html
	rdoc/classes/ForwardInitialization.html
	rdoc/classes/ForwardInitialization/ClassMethods.html
	rdoc/classes/Hash.html
	rdoc/classes/Object.html
	rdoc/classes/Object/InstanceExecHelper.html
	rdoc/classes/String.html
	rdoc/classes/Taza.html
	rdoc/classes/Taza/Browser.html
	rdoc/classes/Taza/BrowserUnsupportedError.html
	rdoc/classes/Taza/Entity.html
	rdoc/classes/Taza/FilterError.html
	rdoc/classes/Taza/Flow.html
	rdoc/classes/Taza/Page.html
	rdoc/classes/Taza/Settings.html
	rdoc/classes/Taza/Site.html
	rdoc/classes/TazaGenerator.html
	rdoc/created.rid
	rdoc/files/lib/app_generators/taza/taza_generator_rb.html
	rdoc/files/lib/extensions/array_rb.html
	rdoc/files/lib/extensions/hash_rb.html
	rdoc/files/lib/extensions/object_rb.html
	rdoc/files/lib/extensions/string_rb.html
	rdoc/files/lib/taza/browser_rb.html
	rdoc/files/lib/taza/entity_rb.html
	rdoc/files/lib/taza/fixture_rb.html
	rdoc/files/lib/taza/flow_rb.html
	rdoc/files/lib/taza/page_rb.html
	rdoc/files/lib/taza/settings_rb.html
	rdoc/files/lib/taza/site_rb.html
	rdoc/files/lib/taza/tasks_rb.html
	rdoc/files/lib/taza_rb.html
	rdoc/fr_class_index.html
	rdoc/fr_file_index.html
	rdoc/fr_method_index.html
	rdoc/index.html
	rdoc/rdoc-style.css
	taza.gemspec
updated template for failing_examples
updated template for failing_examples