Merge branch 'master' of github.com:brianc/node-sql