Merge branch 'master' of git://github.com/killbilling/recurly-java-library

Conflicts:
	src/main/java/com/ning/billing/recurly/RecurlyClient.java
	src/main/java/com/ning/billing/recurly/model/Subscription.java
	src/main/java/com/ning/billing/recurly/model/SubscriptionUpdate.java
	src/test/java/com/ning/billing/recurly/model/TestModelBase.java