Conflicts:
	README.md
	lib/test-factory/page_factory.rb
	test-factory.gemspec
Squashed commit of the following:

commit e612e45828972432520c63f20b4644557120c565
Author: Abraham Heward <aheward@rsmart.com>
Date:   Thu May 16 12:37:00 2013 -0700

    Small code cleanup

commit 1a4bc29f71026df9a01d363a0e03a8181d8ba25e
Author: Abraham Heward <aheward@rsmart.com>
Date:   Wed May 15 13:21:52 2013 -0700

    Added the #commas method for numbers that need commas in them.

commit f74a322ecc16d023e0f9ea3a9bdb5047a3762df2
Author: Abraham Heward <aheward@rsmart.com>
Date:   Fri May 10 08:14:32 2013 -0700

    Fixed the fit method for Checkboxes.

commit 526f6d00be97a11e07d23af2ba43aae8ca9b4a52
Author: Abraham Heward <aheward@rsmart.com>
Date:   Wed May 8 07:50:17 2013 -0700

    Added some more text to the Readme.  Fixed the hole where action methods didn't check to see if the method had already been defined for the class.

commit 054cca0aea7868ed926d2297368bc15ba3c3ca66
Author: Abraham Heward <aheward@rsmart.com>
Date:   Fri Mar 22 10:30:05 2013 -0700

    Tweaked the button and link method comments a little.

commit c748a5bab12ef6a7e6dce4cff5c9bc98a866920b
Author: Abraham Heward <aheward@rsmart.com>
Date:   Tue Mar 19 13:04:27 2013 -0700

    Upped the gem version number.

commit d0a6f73e25942a1713e8c5d7d85ed3285a97deeb
Author: Abraham Heward <aheward@rsmart.com>
Date:   Tue Mar 19 13:03:21 2013 -0700

    Merged changes from development