Manually merging with v2.

.travis.yml

error.go

mysql/benchmark_test.go

mysql/database.go

mysql/database_test.go

mysql/tx.go

postgresql/benchmark_test.go

postgresql/database.go

postgresql/database_test.go

postgresql/tx.go

ql/Makefile

ql/benchmark_test.go

ql/database.go

ql/database_test.go

ql/tx.go

sqlite/benchmark_test.go

sqlite/database.go

sqlite/database_test.go

sqlite/tx.go