Upgraded to Umbraco 7.1.4 and updated Merchello
Merge pull request #9 from rustyswayne/master

Upgraded to Umbraco 7.1.4 and updated Merchello