Merge pull request #777 from bowring/fixswap

Fixed #776

Merge pull request #775 from bowring/fixtest2

Fixed bug

Merge pull request #771 from bowring/joinfix

Joinfix

Merge pull request #768 from bowring/ratiomodeI

Ratio Mode phase I completed

Merge pull request #763 from bowring/reportzip

Changed report engine

Merge pull request #760 from bowring/issue759

Fixes #757 and fixes #759

Merge pull request #755 from bowring/issue754

Fixed #754 and refactored

Merge pull request #755 from bowring/issue754

Fixed #754 and refactored

Merge pull request #753 from bowring/cleanup

Cleanup and refine solution to issue #613

Merge pull request #750 from bowring/refactor

Solved issue #613 for review