fixes
merge attempt
Merge pull request #3 from lyft/merge_attempt

fixes
Merge remote-tracking branch 'origin' into Fix-perm-socket-file