Moved user configuration into a separate file.
Merge branch 'master' of https://github.com/fogleman/Craft into key-config
Merge branch 'key-config' of https://github.com/emilis/Craft

Conflicts:
	main.c