Cleaned up the package.json in prep for NPM
NPM friendliness
Merge branch 'npm'