remove waffle branch spec

Waffle was taken off of origin/master, because it exposed bugs in
piglit test linking.  Now that piglit has been fixed, we can move back
to the master.