Merge pull request #4 from noelbk/contrail

Cleanup and many updates from Noel
Merge pull request #5 from noelbk/contrail

Contrail
enable fetch_packages
Merge remote-tracking branch 'dsetia/master' into contrail