Rather than being obnoxious about naming, could we not just run the correct tests given the set of changes that we encounter?  I kind of don't like that you have to name your branch something special to get the shorter/longer tests.  Is this something that we have to do b/c of how stages work in travis?