bottle port and debug options moved to config.py
Merge branch 'master' of https://github.com/freedomscripts/fream

Conflicts:
	freamweb/config.py
	freamweb/run.py