Cc/koding build

Fixing stuff for koding build