Fix dependencies with godep. Fixes Issue #76
Merge branch 'master' into track-host-resources