More updated expected results

This should be the last synchronized update before ditching SVN.
Merge branch 'master' of github.com:blackoutjack/jamweave