Cleanup since we may have to revert to using this
Merge branch 'pansenti-base' of github.com:floft/meta-ecam into pansenti-base