shuffled stuff around to better support Node

...and hopefully get specs running on Travis CI