Add nave.sh node version manager to project root
Use nave to force our node version to 0.10.24
Fix merge conflicts