Began work on perceptron.
Began work on perceptron.
Merge branch 'perceptron' of github.com:kedz/discourse into perceptron

Conflicts:
	discourse/__init__.pyc
	discourse/data.pyc
	discourse/inference/__init__.pyc
	discourse/inference/lp.pyc
	discourse/inference/svm.pyc
	discourse/models/__init__.pyc
	discourse/models/barzilay.pyc
	discourse/models/entity_grid.pyc