Revert "Merge branch 'master' of http://github.com/keithamoss/mapproxy"

This reverts commit f1b807eb7c224ddf705c18b341ca3133bd318148, reversing
changes made to 17310f82f46282eee1149a7b8db1f9f349e821b2.