Merge pull request #682 from khawkins/unstable

Reverting build_npm.xml; this will stay as a strictly npm build script