intermidiate comit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/config.c
added missing file from commit
intermidiate commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/addresses.h
	src/config.c
more configuration moved to new format. Started separating setings into
categories (general and sound so far)
removed unwanted spaces
Merge branch 'jvlomax-master'