Merge branch 'master' into self-check

Conflicts:
	configure-aspen.py
	gittip/testing/__init__.py
	tests/test_billing.py
	tests/test_charts_json.py