fixed major invariant compromising bugs and tests
all tests pass, confirmation in progress
Merge branch 'master' of github.com:abhardwaj/barista