Cleaned up the proxy macros and added a new htpasswd authenticated proxy macro