Configuration

Merging in config branch – we've got working configuration code now... (although it doesn't save your settings)