Modified to use mer infrastructure repos.
Merge pull request #1 from tkeisala/master

Update to use mer infra