Merge pull request #534 from lynnaloo/master

Added missing functions to fix orm install
Added rimraf to package.json