Merge branch 'master' of github.com:braintree/braintree_python

Conflicts:
	braintree/version.py
be a little more forgiving about older versions
Merge branch 'master' of github.com:MontmereLimited/braintree_python into python_3_beta-six

Conflicts:
	braintree/version.py