Merge pull request #1034 from rustyswayne/Refactor/M-502

Merge 1.6.1
Merge pull request #1035 from rustyswayne/Refactor/M-502

Finishes 'merchello.models' module concept