hi
Merge branch 'master' of https://github.com/naiaden/cococpyp

Conflicts:
	hpyplm/Makefile
Merge branch 'master' of https://github.com/naiaden/cococpyp
Merge branch 'master' of https://github.com/naiaden/cococpyp
Merge branch 'master' of https://github.com/naiaden/cococpyp
skipgram addition