Merge branch 'REP-276' of https://github.com/rackerlabs/repose into REP-276

Conflicts:
	repose-aggregator/core/core-lib/src/test/groovy/com/rackspace/papi/filter/PowerFilterChainTest.groovy