Merge pull request #851 from jlipps/master

fixing misc issues with tests
make sure fruitstrap gets into build/ for npm releases (cc @snevesbarros)