Rewrote bundle statement logic (reduce shift/reduce error by 1). we have no better error reporting for wrong bundle statement and added
constraint token test.
Merge pull request #530 from basvandervlies/fix_shift_reduce

Rewrote bundle statement logic