Fix Frisby so params options merge into request

 * Add test for redirect options in request dependency
 * Update test for mocks using deprecated method for adding headers
README update [fixes #9]
Add 'timeout' option for globalSetup
Support for file uploads via request

 * Option { form : true } to use request forms for file uploads
Version 0.6.1
Custom matchers are now global on Jasmine
Adds the ability to loop over objects with an & segment
Merge pull request #18 from donatj/master

Added the ability to loop over objects using an & segment marker.
Add support for .not() before Frisby matchers

 * .not().expectJSON() and .not().expectJSONTypes() support tested
 * Using Jasmine spec.fail() method directly now for failed tests
 * Added Jasmine assertions for custom matchers to maintain expected
   assertion count for developer testing
Version bump
Fix regression on expectJSONTypes testing root
Enhance expectJSONLength to allow <, <=, >, >=

Previously only exact length matches were allowed, now allow
.expectJSONLength('properties', '<=10')
Enhance expectJSONLength to allow <, <=, >, >=

New test coverage for this new functionality of <, <=, >, >=. You can run the current test suite by running npm test.
Merge pull request #20 from danactive/patch-1

Enhance expectJSONLength to allow <, <=, >, >=
Version 0.6.7 release
Allow setting body directly via params
Merge pull request #22 from dshafik/master

Allow setting body directly via params
Correct Case Sensitivity for HTTP methods
Merge pull request #24 from cllunsford/topic_methods

Correct Case Sensitivity for HTTP methods
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/frisby.js