Added Timeout for poolboy:transaction
Merge commit 'a50e24e3c30b1b0bddc3511eac5661d110885f6a'

Conflicts:
	src/poolboy.erl
Add latest versions of Erlang to our Travis tests