Removed OOI code
Merge branch 'master' of github.com:scionrep/scion
Bring back CEI
Initial boostrap works