fixed unit tests and feature file merging, changed some default config values to empty strings from None
removed executable permissions from cfg files. sigh
Merge branch 'master' of https://github.com/EducationalTestingService/skll
Merge branch 'master' of https://github.com/EducationalTestingService/skll