hooked up the settings knobs
bullshit
Merge branch 'taylor09-30-2014'