fixed some brokens bits of shape inference
Merge branch 'master' of github.com:iskandr/parakeet