cuttlefish integration
Merge pull request #1 from ericmoritz/feature/cuttlefish-packaging

Feature/cuttlefish packaging
Merge branch 'master' into develop