Merge branch 'master' of https://github.com/bertoncobb/magento-extension
Merge remote-tracking branch 'upstream/master'
Updating plugin to use HpsExceptionMapper
Merge pull request #8 from bertoncobb/adding_exception_mapping

Adding exception mapping