fix bug with default value for timeout

closes #11 https://github.com/guardianproject/cacheword/pull/11
fixes #3698 https://dev.guardianproject.info/issues/3698
Merge branch 'master' of https://github.com/guardianproject/cacheword

Conflicts:
	cachewordlib/src/info/guardianproject/cacheword/CacheWordSettings.java