Add keywords to application settings

Add keyword collection to the application settings
Add latest changes for settings

Submit latest changes for settings. No real commit message, just a
stash, really.
Merge branch 'settings-01' into settings

Conflicts:
	FunctionMerge.suo
	FunctionMerge/Settings.cs