Release 0.9.4

Pulling in a few things that were in master but apparently not merged back to dev. Fixing package.json issues.