Fixes needed to set up on fresh environment

Summary: While setting up on dev5, I had to make these changes to get everything in a workable state.

Reviewers: marcua

Reviewed By: marcua

Differential Revision: http://phabricator.locu.com/D5031