set travis branch to master
moved gson stuff into its own class