* Minor tweak that should be irrelevant
* Updated train_iter script
* Unhacked the label guessing script a little
Merge branch 'master' of https://github.com/syllog1sm/redshift
* Reinstating instance hashing
Merge branch 'develop' of https://github.com/syllog1sm/redshift into develop

Conflicts:
	redshift/parser.pyx