change block parameters so they don't lie
add new test for Submodels
Newer versions of bundler want an argument when installing a gem
update dependencies

This is being done for several reasons 1) to allow us to run updated versions of Nokogiri and 2) so we can run updated versions of ActiveSupport
backrev gemspec since the Blackbaud branch is less than 0.6.9
changed my mind about ActiveSupport - also, people do not seem to have a problem installing Nokogiri 1.6.1
Merge remote-tracking branch 'remotes/origin/master' into update_dependencies

Conflicts:
	lib/watirmark/version.rb
	watirmark.gemspec
Fix problem with screenshot links not working introduced with Cucumber 1.3.17. This solution actually embeds the screenshot in the results.html instead of having the html link to a separate image file.
Merge branch 'master' into update_dependencies

Conflicts:
	watirmark.gemspec
Updates default firefox profile for focusmanager to be in testmode
Merge pull request #18 from convio/update_dependencies

Update dependencies
passing empty cucumber tables results in the transformed model to contain a key value pair where the key is an empty string that points to a nil value. Removing the empty string from the hash
Merge pull request #16 from convio/screenshot_fix

Fix problem with screenshot links not working introduced with Cucumber 1.3.17
use convio/watirmark in generated gemfile
bump version
Merge pull request #19 from titusfortner/focusmanager

Updates default firefox profile for focusmanager to be in testmode