twitter/secured layer config update
fix secured layers
Merge remote-tracking branch 'upstream/master' into Development
CT's WIP codebase as on Sep 27, 2013