Import database/sql rev 0a4f829ee9ff
Merge branch 'upstream'

Conflicts:
	sql.go
Fix for upstream changes

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Update travis to Go 1.4

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Merge pull request #1 from flynn/update-upstream

Update upstream