Homestyx hydra

R1:2cf9ded87892

Various linter fixes

Summary: Self explanatory.

Test Plan: `arc lint`

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D13863
Repository: R1 hydra
Commit Date: Aug 11 2015