removing https

This removes https by default.
https can be enabled by specifying "https" with certs in the optional custom config.
also made my master in sync with your master so that i dont have a maintenance headache.