Iris experiment config file discussion...done?
Merge branch 'develop' of https://github.com/EducationalTestingService/skll into develop
Iris cross-val config file
Merge branch 'develop' into feature/fix_unit_tests
Qualified checks for grid_objective

- Modified learner.py such that the check for grid_objective being valid only happens if grid_search is set to True.
Specify feature_hasher in check_predict for train and predict
Replaced assert equality checks with eq_
Fix weird issue where nose all of a sudden doesn't discover tests
Merge branch 'develop' into feature/fix_unit_tests
Updated grid objective function validity test

Now allows function types 2,3 and 4 for regression models
And checks for class types in classification models
Adds a simple backoff in case the classes are of mixed type
Added tests for regression grid objective funcions

Needs to be extended for classification case
corrected 'type-2' list
Modernized test_summary

- Modified make_summary_data to use make_classification
- Reorganized test_summary and check_summary_score to run both with and without feature hashing in a single function.
Fixed tests to work with python 2.7

- Converted rounded numbers to ints for python 2.7
- Used assert_almost_equal instead of eq_ in test_summary since python 2.7 thinks `0.5666666666666667` and `0.566666666667` are not equal. Sigh.
Merge branch 'feature/fix-grid-objective-check' into feature/fix_unit_tests

Conflicts:
	skll/learner.py
	tests/test_skll.py
Modified rare class test to run in memory
Merge pull request #176 from EducationalTestingService/feature/fix_unit_tests

First step towards fixing and organizing unit tests.
safe_float now returns ints when appropriate

1.0 will not turn into an int, just strings that are integers.

This lets us check the dtype of the FeatureSet.classes array to
determine what type of experiment we're conducting.
Switch objective function test to use classes array dtype

I also reworked the logic a bit so that we only do the more detailed
checking if we've got a classifier and it's not using a
"classifier-only" objective function.
Merge pull request #181 from EducationalTestingService/feature/fix-grid-objective-check

Fix grid objective check