changed package.json to avoid possible install conflicts
Merge branch 'master' of github.com:crh3675/node-mysql-ssl-dev