Merge branch 'feature/add_config_file' of github.com:proffalken/openrail into feature/add_config_file

Conflicts:
	corpusdb.c
	include/libopenrailconfig.h
Merge branch 'feature/add_config_file' of github.com:proffalken/openrail into feature/add_config_file
remove debug stuff