Changes:
More files into .gitignore
Minor machine specific change on Makefile
Major change on conll.py (subs.py is also added) to handle substituted
forms to be used by the maltparser