Changing stuff just for fun
Brought in branch from seandst.  Fixed a typo with the new OPTIONS_TEMPLATE.  Fixed a recursion depth issue with the 'config' variable in the save_config() function