Better configuration management

Reviewers: marcua

Reviewed By: marcua

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