Update tests_skll.py to include fixes from featureset branch.
Merge branch 'develop' into feature/create_featureset_class

Conflicts:
	tests/test_skll.py