Updated for local/cloud9 development