Merge pull request #523 from creationix/run_slow_nvmrc_tests_too

Actually run all tests; fix some bugs