Fix manifest
Point to the right main repo
Merge pull request #31 from fubaz/setupfixing

Setup fixing