final draft from Josh
Merge branch 'master' of https://github.com/edechter/GrammarInduction into prism

Conflicts:
	drafts/cfp/draft.tex
Changes and fixed problem with bib file.
Merged changes.