updated branches for travis integration