Merge branch 'master' of https://github.com/tgrall/couchbase-sql-importer

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/tgrall/couchbase-sql-importer

Conflicts:
	README.md