moved some bits and bobs around, and changed some scopes to the support type
moved some bits and bobs around, and changed some scopes to the support type

mattfoster/gnuplot-tmbundle,kevinsawicki/gnuplot-tmbundle