Fixed feature selection, I think
Merge branch 'master' of http://github.com/niberg/dangerzone

Conflicts:
	Perceptron.py