Marvin is local now
Merge pull request #16 from detroit-labs/marvin

Marvin is local now