Cc/koding build

Ugly changes to suuport koding builds