Fix Travis bug, cleanup PDO a wee bit