Remove unecessary options from config, remove accidentally commited config file.
Authored by: Safety0ff 2010-08-04
Parent: [r381]
Child: [r383]
