Merge pull request #761 from rustyswayne/1.3.0

Updates Merchello dev version to 1.2.14