reorganize Gemfiles
more standard travis config