changing parseInt to parseFloat so that non-int measurements don't get chopped off
Change timeout for elements to appear
Merge branch 'refs/heads/pr/13'
Added test for floating-point comparisons
1.0.1
added --reportFormat config for cucumber report format
Merge branch 'formatter_config' into imagediffgen
added config file support for failing immediately on first mimage mismatch
better error messaging
Merge branch 'better_error_messaging' into imagediffgen

Conflicts:
	features/support/imagetest.js
Merge branch 'feature/4' into imagediffgen

Conflicts:
	features/support/imagetest.js