Bring CFX Settings back to Settings, final destination

Summary: Change-Id: Ia23bc5f09ad151c7af78316e4beed150238d64fa

Test Plan: pure win, no derp found

Reviewers: Mustaavalkosta, michyprima, rlasalle15, randall.rushing, synergy, Roach

Differential Revision: http://review.codefirex.com/D249