fix client token, SubscriberKey now = email by default
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/exact-target-api/client.rb