added pay_token attribute
Update version.rb
add gift_certificate_code  to item
Merge branch 'master' of https://github.com/Riskified/ThreeDeeCart into rails4
Merge branch 'rails4' of https://github.com/Riskified/ThreeDeeCart into rails4

Conflicts:
	lib/three_dee_cart/order.rb
	lib/three_dee_cart/version.rb