Modifies sendgrid_unique_args to be accessible at a class level
Allows unique args to be set in both the mailer class and mailer methods. Includes tests. Also gets existing tests running and passing.
Removed unnecessary lines

These lines are actually conflicting with the previous statement that merges the class level defaults with the method arguments.
More issues with unique_args

The first lines were removed as they were redundant but didn't default args to a hash.

In the event that the line is not called from a mail method at all, we default in the json builder so that the code runs.

The behavior is now as intended.  Args can be set globally or at method level.  At method will override global.
Merge pull request #8 from CompassAging/master

I had to remove these lines since they were actually breaking the desired functionality.  Can you review and merge?
Merge branch 'master' of https://github.com/DanOlson/sendgrid into DanOlson-master

Conflicts:
	lib/sendgrid.rb
fixing tests, removing empty filters from header
Don't add unique_args to custom header if it's an empty hash.
Version bump to 1.2.0
Regenerate gemspec for version 1.2.0
Add railtie to automatically include SendGrid in ActionMailer. Restructure.
Remove puts. Add DEBUG constant. Remove old rails code
gemspec modifications. Update README
Oops. Removed json
Rename files to sendgrid for require purposes
Update README and version
Merge pull request #12 from drewtempelmeyer/v2

Remove Rails 2 support. Add Railtie.
added rspec and cursory tests
removed auto inclusion in rails
cleaned up code