Got through add/intattr, still have shift/reduce conflicts
Merge branch 'master' of https://github.com/jrheizelman/GraphQuil