Cleanup and use watchify to cache builds