Add serve/url options; broke out proxy/bundler stuff