fixed send issue
Fixed documentation bug, setting :mailjet_smtp to :mailjet
added axtesting
updated documentation for resource names
updated documentation -- repositioned 'naming conventions'
added attachment and inlineattachment to message_delivery.rb
add header to message_delivery.rb
removed extra backslash in uri; changed active_support json; added ContactID and ListID to Listrecipient resource
added better error handling
changed active_support parse json times back
Merge branch 'master' into ksol-fix

Conflicts:
	lib/mailjet/message_delivery.rb