add new settings variables and clean up form #3951

#3915 

The new settings (no logic yet):

![screen shot 2013-10-09 at 3 02 47 pm](https://f.cloud.github.com/assets/228733/1300666/96a537e8-3115-11e3-9a8f-73af3f7e32dd.png)