upgrade dependencies; gitignore
Merge branch 'master' of https://github.com/jmarca/calvad_psql_to_couchdb

Conflicts:
	package.json