Merge remote-tracking branch 'rackerlabs/master' into standard-header

Conflicts:
	docs/index.rst
	src/test/groovy/org/rackspace/deproxy/HeaderTest.groovy