Update to keep forks in sync.

Maybe the assets is still a overflow but I keep them there if needed when writing the missing feature specs. If you know a good way to test gateways using VCR let me know.