Cleaned up configuration settings

Also updated version number.