Re-enable travis stuff, cleanup gemfiles